| commit | 4edd99dfc9913f6690311fe0bc22046f11626633 | [log] [tgz] |
|---|---|---|
| author | Jorge Lucangeli Obes <jorgelo@google.com> | Wed Feb 24 21:48:16 2016 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Wed Feb 24 21:48:16 2016 +0000 |
| tree | 680c86d8f977907815c36901c4d60de9b272ecb5 | |
| parent | 3bd3bc9e341eb47a24c843387bc1b28c9b99ca4e [diff] | |
| parent | fb66a101aef83ff9b9b8e6e02e9588eadfd00d98 [diff] |
Resolve merge conflicts of c5972cda6c to stage-aosp-master. am: 1771e93797 * commit '1771e93797755ea8db489a42410c20c5fbf3bafc': Sync internal<->AOSP user list.