| commit | ab380fd77d4872d94cda212e91cdf9a847d99bf9 | [log] [tgz] |
|---|---|---|
| author | Android Build Merger (Role) <android-build-merger@google.com> | Wed Jun 08 15:52:05 2016 +0000 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Wed Jun 08 15:52:05 2016 +0000 |
| tree | 8adc9cf251eaac1c5c6964941c594db549e8dc26 | |
| parent | 61da13a57f0bb13fff93e89324e52fe61b14570f [diff] | |
| parent | aec20552a41fc9ca93e5ee97c3ddfe0208937383 [diff] |
Merge "resolve merge conflicts of 6aa6ddb to nyc-dev am: 771b6eb8d9 am: 91d78acbd3" into nyc-mr1-dev-plus-aosp