| commit | 6d85c8a833b27d58f69faf62f1f4ce951ef9d672 | [log] [tgz] |
|---|---|---|
| author | Android Build Merger (Role) <android-build-merger@google.com> | Fri Jan 13 21:26:25 2017 +0000 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Fri Jan 13 21:26:28 2017 +0000 |
| tree | 64a8d89bd95613e6cecbe32101038d9d5486ceb5 | |
| parent | c697ffe98b4d190b99e9d5de80fbf9f7ba5df194 [diff] | |
| parent | 4c349b67aa20d6cc3cd8be80c645fbadc3affc98 [diff] |
Merge "resolve merge conflicts of ad4aa1ce7d3d to nyc-mr1-dev am: eb35ad9969 am: 3aac3ebee1 am: 9af145dcc4" into nyc-mr2-dev-plus-aosp