| commit | ba013afe36f3954af74c81779801704bd5203283 | [log] [tgz] |
|---|---|---|
| author | Steve Pfetsch <spfetsch@google.com> | Tue Oct 17 20:34:00 2017 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Tue Oct 17 20:34:00 2017 +0000 |
| tree | edeb83edad46d65f40cc5e38221b6734b4d2a4e2 | |
| parent | 7f458d41ff1074d2367f79220542d937849e4cdb [diff] | |
| parent | 812125f11862968dfd7945b13e8a44e66cd50a45 [diff] |
resolve merge conflicts of 5abba5cb to oc-dr1-dev am: 812125f118 Change-Id: Ibedbf64fceaa8b483333e0fc702d54972e2034f8