| commit | 7eeb0c72737082a5b7b3977a258e5b5a507e44e3 | [log] [tgz] |
|---|---|---|
| author | TreeHugger Robot <treehugger-gerrit@google.com> | Thu Jan 25 02:38:20 2018 +0000 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Thu Jan 25 02:38:20 2018 +0000 |
| tree | 3b12535e1bb41bf5df8b22726e3d7ec8d5fedebe | |
| parent | f3222e14df705aadafa7e17d85c81d3549dc7a86 [diff] | |
| parent | 569e120af7b89e74271c89cac416292b982e2c27 [diff] |
Merge "resolve merge conflicts of e11aa3ebc205f6524d964d884b614bc3d1c36865 to oc-mr1-dev-plus-aosp" into oc-mr1-dev-plus-aosp