Trevor Johns e1b56701fd Merge changes from topic \'merge_docs_nyc-dev\' into nyc-dev am: 59c9a93 ...

am: 254f1b8

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

Change-Id: I32a3081af9ca5533785c90b7239ffd5b5e69d5bf

2016-04-20 21:15:11 +00:00

..

android/telephony

Merge changes from topic \'merge_docs_nyc-dev\' into nyc-dev am: 59c9a93

2016-04-20 21:15:11 +00:00

com/android

Merge "Add addRegistrationListener function to IImsService.aidl" into nyc-mr1-dev

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