| commit | c0d2c43a22c9a0feda8d651d432aa3893e0cf952 | [log] [tgz] |
|---|---|---|
| author | Trevor Johns <trevorjohns@google.com> | Wed Apr 20 21:12:38 2016 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Wed Apr 20 21:12:38 2016 +0000 |
| tree | 6945b68543ededf07816dd60fd7395fe70390fbf | |
| parent | 24cd97aba3cc388ec639a4627e67e96dc4e65ac1 [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: Iddc9419069d8f5d555baf0c1ef4b2f2ebf75c370