| commit | 730c5d09c6b47bc38975e50f8f8a7b2b008ab457 | [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 | b3de868d8b58f1b7960f16ffe9fc9d57385099ba [diff] | |
| parent | 72e5429f1af225f3284010e1a6cdaf6f687bbfeb [diff] |
Merge "resolve merge conflicts of 712b628d7 to oc-dr1-dev-plus-aosp" into oc-dr1-dev-plus-aosp