| commit | 254f1b8a43480749b7061129289d34bc15d345a5 | [log] [tgz] |
|---|---|---|
| author | Trevor Johns <trevorjohns@google.com> | Wed Apr 20 18:43:55 2016 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Wed Apr 20 18:43:55 2016 +0000 |
| tree | c54fa6bb31f94d517b0cbafc55719b409abc2e0a | |
| parent | ab344b84e2a96707720d19feb642e57b4b827976 [diff] | |
| parent | 59c9a93fc268e226495d4ee8cf7c507c2ea2c433 [diff] |
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