| commit | 792faa38464cf679e700c4ffb3d58532c52ea922 | [log] [tgz] |
|---|---|---|
| author | Jordan Liu <jminjie@google.com> | Sat Jun 10 00:30:49 2017 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Sat Jun 10 00:30:49 2017 +0000 |
| tree | 08de6bc357514457afafd4c5a6ce181697410df8 | |
| parent | 5033cbc7b0534ce917df8da2e7a30ef4d9b605b3 [diff] | |
| parent | 5d24c2c214be9776d4da3c7638515dda55b7b21e [diff] |
Fix merge conflict from oc-dr1-dev to oc-dr1-dev-plus-aosp am: 5d24c2c214 Change-Id: Id61ffda92b0b9b65214c143fdff16e7026ac1072