| commit | ba563c00f099cb5ff97a486886fccc888791c8ce | [log] [tgz] |
|---|---|---|
| author | Jason Monk <jmonk@google.com> | Fri Jul 28 20:30:32 2017 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Fri Jul 28 20:30:32 2017 +0000 |
| tree | adc37c5407a06daef907a8bf64211df5c2fb0b15 | |
| parent | 381c79336cfbe898eaafedb87b2087f3f2a8274d [diff] | |
| parent | 94b8ed8964fe429837134ce9a0f2f78d2a75dd44 [diff] |
Merge "resolve merge conflicts of 148db9dfa669 to oc-mr1-dev" into oc-mr1-dev am: 94b8ed8964 Change-Id: I8f9dab6dc460080d75bf1d8e27d216eb261ef507