| commit | 773ebbdfe37a822e044401b1c5d32812187b3db0 | [log] [tgz] |
|---|---|---|
| author | TreeHugger Robot <treehugger-gerrit@google.com> | Sat Sep 30 00:57:51 2017 +0000 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Sat Sep 30 00:57:51 2017 +0000 |
| tree | 82afa467b14897d0686e6f753b03302fa126d434 | |
| parent | 202c5af4be8f804ee68bdca82e760473b211b25c [diff] | |
| parent | 62398781f5a4ce32906cdbfc1ad8c34357e19eac [diff] |
Merge "resolve merge conflicts of 73d9596bc to oc-mr1-dev-plus-aosp" into oc-mr1-dev-plus-aosp