| commit | 7ab4d90c53bb32f66f505dd720e433a1f32bb636 | [log] [tgz] |
|---|---|---|
| author | Android Build Merger (Role) <android-build-merger@google.com> | Fri Apr 22 15:18:06 2016 +0000 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Fri Apr 22 15:18:09 2016 +0000 |
| tree | ee183b7435afd9d6408bfccc8da971c0a5d54f9e | |
| parent | 280ca7b83a84f51a80a034c3d28b5185db4c2693 [diff] | |
| parent | d2c0080b1553ebd0925aa9869eae0df82a01e6c3 [diff] |
Merge "resolve merge conflicts of 9d1357c to nyc-dev-plus-aosp am: 067d95dd2b" into nyc-mr1-dev-plus-aosp