Trevor Johns 59c9a93fc2 Merge changes from topic 'merge_docs_nyc-dev' into nyc-dev ...

* changes:
  Remove links to createAndInitializeUser() and createUser()
  Resolve merge conflicts of a5060ee to nyc-dev

2016-04-20 18:35:57 +00:00

..

android/telephony

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

2016-04-20 18:35:57 +00:00

com/android

Merge "Cold Sim issue fix" into nyc-dev

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