| commit | 82c15e357e0f72cb6bb940297914b53cdbe81491 | [log] [tgz] |
|---|---|---|
| author | Erik Kline <ek@google.com> | Fri Oct 27 11:57:00 2017 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Fri Oct 27 11:57:00 2017 +0000 |
| tree | e8e8bda1c07483627aec28f281dcaac2558df5c6 | |
| parent | c724e30cda1e51eef28c4339515e49e4f53c2f87 [diff] | |
| parent | fe96fc644618f1e81d8283cfe15342be2eeb514f [diff] |
resolve merge conflicts of 8a3c0c61e to oc-mr1-dev-plus-aosp am: fe96fc6446 -s ours Change-Id: I10f709d24da3615f984dababb32c5d00145e2c8f