Trevor Johns c0d2c43a22 Merge changes from topic \'merge_docs_nyc-dev\' into nyc-dev ...

am: 59c9a93

* commit '59c9a93fc268e226495d4ee8cf7c507c2ea2c433':
  Remove links to createAndInitializeUser() and createUser()
  Resolve merge conflicts of a5060ee to nyc-dev

Change-Id: Iddc9419069d8f5d555baf0c1ef4b2f2ebf75c370

2016-04-20 21:12:38 +00:00

..

android/telephony

Merge changes from topic \'merge_docs_nyc-dev\' into nyc-dev

2016-04-20 21:12:38 +00:00

com/android

Merge "Cold Sim issue fix" into nyc-dev

2016-04-20 00:10:01 +00:00