| commit | 851bfc38d4167103c2f2dfe7777a0cc8b30276e5 | [log] [tgz] |
|---|---|---|
| author | Ian Pedowitz <ijpedowitz@google.com> | Thu Jun 08 05:42:17 2017 +0000 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Thu Jun 08 05:42:24 2017 +0000 |
| tree | a936f51362658e38ac30403ff667f1c1aa93a14a | |
| parent | d35a439a90d48a8a12e243220a281c433e7626e6 [diff] | |
| parent | 5eee5988c1a9381a1a3961cd434d9ce162ba8cfb [diff] |
Merge "resolve merge conflicts of 7ea4f66f3557 to oc-dr1-dev-plus-aosp" into oc-dr1-dev-plus-aosp