Trevor Johns 254f1b8a43 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: I3ce213d0e7412125861d39f1726be4b5a751c828

2016-04-20 18:43:55 +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 "Add addRegistrationListener function to IImsService.aidl" into nyc-mr1-dev

2016-04-20 02:43:15 +00:00