| commit | 1f291646d9a7309fadc1bee215f2f51f56a07e05 | [log] [tgz] |
|---|---|---|
| author | Ying Wang <wangying@google.com> | Thu May 12 03:01:14 2016 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Thu May 12 03:01:14 2016 +0000 |
| tree | 314ae21dd06744bec844ebfdd031acdfcbc523a2 | |
| parent | 218b365e6bebdbd39ec486b061682a48973a0e6e [diff] | |
| parent | da99944e4763e4deb1130bbd36ede7855fbb46ff [diff] |
Merge "resolve merge conflicts of b97dd87 to nyc-dev-plus-aosp am: c342196249" into nyc-mr1-dev-plus-aosp am: da99944e47 * commit 'da99944e4763e4deb1130bbd36ede7855fbb46ff': Change-Id: Iadc3ddbc59db2b31c294006f931ab82061424bef