| commit | a42329235832acdc6809402e7b96efd20b37e3c4 | [log] [tgz] |
|---|---|---|
| author | Lorenzo Colitti <lorenzo@google.com> | Wed Jul 12 14:01:51 2017 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Wed Jul 12 14:01:51 2017 +0000 |
| tree | 527106b6d5584483893d91b85953c3c74d538051 | |
| parent | bef056732bb574b21d06cf574c2d1ad04b1360a9 [diff] | |
| parent | dbdf7c1484825856a1c0d96b6496ac4d28e95948 [diff] |
resolve merge conflicts of 5e7b01c8236b to oc-dr1-dev-plus-aosp am: dbdf7c1484 Change-Id: I29bff92b43e0662f11823c795036e41e51477017