| commit | 5748ca639c159cc2fde77f81c1d7ec2f596a4fcf | [log] [tgz] |
|---|---|---|
| author | TreeHugger Robot <treehugger-gerrit@google.com> | Thu Jun 29 01:39:57 2017 +0000 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Thu Jun 29 01:39:57 2017 +0000 |
| tree | 72a9f915898149116de830e02f1c108e823c290b | |
| parent | 8805bf8b297079fc9ba0275707c062108609aa14 [diff] | |
| parent | 0dc2aa27ed744811a5270d22029641195bfa5c61 [diff] |
Merge "resolve merge conflicts of 712b628d7 to oc-dr1-dev-plus-aosp" into oc-dr1-dev-plus-aosp