| commit | 75b8428b4c36a2c1278efc587c56c0f07f959fd1 | [log] [tgz] |
|---|---|---|
| author | TreeHugger Robot <treehugger-gerrit@google.com> | Tue Nov 14 11:00:56 2017 +0000 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Tue Nov 14 11:00:56 2017 +0000 |
| tree | 87b63fe8f83c2dfb4dacee6488659c8756abc8c8 | |
| parent | e803ecf89ab74ed43ed665623f09d79664bd815c [diff] | |
| parent | 3092f98101991c06b0d2e33326a8b3b6af0b143b [diff] |
Merge "resolve merge conflicts of 32ba3eaa to oc-mr1-dev-plus-aosp" into oc-mr1-dev-plus-aosp