diff options
| author | Trevor Johns <trevorjohns@google.com> | 2016-04-20 21:15:11 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2016-04-20 21:15:11 +0000 |
| commit | e1b56701fd219227adae615fe81f03d5db4ae433 (patch) | |
| tree | ca6e8fa93173379f9db85662356d327de453ce2e /docs/html/sdk/api_diff/19/changes | |
| parent | 4450987a230dff40a039547f020d50ae7f5919c8 (diff) | |
| parent | 254f1b8a43480749b7061129289d34bc15d345a5 (diff) | |
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
Diffstat (limited to 'docs/html/sdk/api_diff/19/changes')
0 files changed, 0 insertions, 0 deletions