| commit | df3be9cc7981ce0623686013d529aac18b6d9e7c | [log] [tgz] |
|---|---|---|
| author | TreeHugger Robot <treehugger-gerrit@google.com> | Tue Oct 17 19:55:24 2017 +0000 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Tue Oct 17 19:55:24 2017 +0000 |
| tree | 8d07c5aad6a1bb9766eaaa7419853e16e84d0341 | |
| parent | 3206e347d1676e13b6f5d5c0af3d89ee43938dcb [diff] | |
| parent | 58e3fba7c95f1db06f6c2e8de26c8a7ce076bff1 [diff] |
Merge "resolve merge conflicts of 8513b434d3 to oc-mr1-dev-plus-aosp" into oc-mr1-dev-plus-aosp