| commit | 8925146bbb972afbc90ab8b3becec9eb445e90d6 | [log] [tgz] |
|---|---|---|
| author | Steve Muckle <smuckle@google.com> | Mon Aug 14 22:53:51 2017 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Mon Aug 14 22:53:51 2017 +0000 |
| tree | 076204c5cee4922f86ae70550c89f2de04451eda | |
| parent | e0df62696be4ffb3778ad0f904de434c0904ec47 [diff] | |
| parent | 1ff81a85b61997fe23edb6fa5b30ba72bc694039 [diff] |
resolve merge conflicts of d4eb7a322c to oc-dr1-dev-plus-aosp am: 1ff81a85b6 Change-Id: Ic0fb54f2a795dea4ef50c6bdde149d808032970a