| commit | 06cc0892f16b2b38b897f1eea31fbaaffd5ea0c0 | [log] [tgz] |
|---|---|---|
| author | TreeHugger Robot <treehugger-gerrit@google.com> | Thu May 25 18:38:56 2017 +0000 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Thu May 25 18:38:58 2017 +0000 |
| tree | 7c22fa34b2e56dddcd97f79f5252259ab304ccf6 | |
| parent | 08f32459c0072803361a82d72520a0d7e2bb7a86 [diff] | |
| parent | e4d0b1ab4d9f4a63d1096b43326566da850b49c0 [diff] |
Merge "resolve merge conflicts of bb958f0f5 to oc-dev-plus-aosp" into oc-dev-plus-aosp