| commit | 0a9042fadbdd7e6bec8fc83d6d8ce5095e09f735 | [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 | 3e9223f46092b9929022a730ce6e1dcb0c5b20bd [diff] | |
| parent | ac8abec905b56672e13e4723ca96036f686d1825 [diff] |
Merge "resolve merge conflicts of bb958f0f5 to oc-dev-plus-aosp" into oc-dev-plus-aosp