| commit | cc2e8d37e15459a58e839938bf7d8248b0f06164 | [log] [tgz] |
|---|---|---|
| author | TreeHugger Robot <treehugger-gerrit@google.com> | Thu Jul 20 03:29:27 2017 +0000 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Thu Jul 20 03:29:27 2017 +0000 |
| tree | abd790de3008bb98e9446312663916b0d479805a | |
| parent | ca433c4437d27e063731da046cd957dcd2d03aa9 [diff] | |
| parent | 6d35950b360568ff3937ceecbf04bc1ad8bbf5a6 [diff] |
Merge "resolve merge conflicts of 74a5f22d9 to oc-dr1-dev-plus-aosp" into oc-dr1-dev-plus-aosp