| commit | 3b492604cf1c3c1f2c796812ff6e459fa0c9106d | [log] [tgz] |
|---|---|---|
| author | Android Build Merger (Role) <android-build-merger@google.com> | Thu Apr 28 14:20:38 2016 +0000 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Thu Apr 28 14:20:38 2016 +0000 |
| tree | 98a44d75a79943b499210c32ab39200da6f182b4 | |
| parent | 8263b3baee3bf40ac69dc8a74d017ce5be6c906e [diff] | |
| parent | 539f8de77781f3fdf0e81adb15b1b4718911c500 [diff] |
Merge "Merge "resolve merge conflicts of 19ec6b7 to nyc-dev" into nyc-dev am: 4abb8c0 am: e3d8737" into nyc-mr1-dev-plus-aosp