| commit | 72f1824c46fcb8c66f5a92c1328508b831c971ae | [log] [tgz] |
|---|---|---|
| author | TreeHugger Robot <treehugger-gerrit@google.com> | Tue Jul 18 21:45:42 2017 +0000 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Tue Jul 18 21:45:42 2017 +0000 |
| tree | edbb3820b65e00a5f6b983ec2e27204dd3151285 | |
| parent | b111e153d9a9f6915d22e0e0097c85be4e1363bd [diff] | |
| parent | 3c2a468cd562029e3d09f62f8a1116c4e365b639 [diff] |
Merge "resolve merge conflicts of f8187f4e1 to oc-dr1-dev-plus-aosp" into oc-dr1-dev-plus-aosp