diff options
| author | Trevor Johns <trevorjohns@google.com> | 2016-04-20 21:32:39 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2016-04-20 21:32:39 +0000 |
| commit | 0392182bff9ba7888aa9cd699d2e6d3018a0d742 (patch) | |
| tree | 0aa027ff3315327620b096d47c1d2d4316226504 /docs/html/sdk/api_diff/19 | |
| parent | ecedb41e5d3f753f78bf701e1e6559134b32bf82 (diff) | |
| parent | e1b56701fd219227adae615fe81f03d5db4ae433 (diff) | |
Merge changes from topic \'merge_docs_nyc-dev\' into nyc-dev am: 59c9a93 am: 254f1b8
am: e1b5670
* commit 'e1b56701fd219227adae615fe81f03d5db4ae433':
Remove links to createAndInitializeUser() and createUser()
Resolve merge conflicts of a5060ee to nyc-dev
Change-Id: I8cf43f9ad491c6f23eb5fe0051293267ab2d03bf
Diffstat (limited to 'docs/html/sdk/api_diff/19')
0 files changed, 0 insertions, 0 deletions