| commit | c06eedb353f33c86615279ffd29cc8b3a5cb0d79 | [log] [tgz] |
|---|---|---|
| author | Android Build Merger (Role) <android-build-merger@google.com> | Tue Jun 07 18:04:20 2016 +0000 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Tue Jun 07 18:04:22 2016 +0000 |
| tree | b2afa73c9bf8ad7975e388093866fa2b13f93568 | |
| parent | 942b04e5dc3b932334c8bd5ae49a9e0366377dd8 [diff] | |
| parent | 1a0bc037bb32642e75152d4822ae818b61c32286 [diff] |
Merge "Merge "resolve merge conflicts of b9d266f to nyc-dev-plus-aosp" into nyc-dev-plus-aosp am: e61d3ff3d1" into nyc-mr1-dev-plus-aosp