| commit | b06c38687a0ecf8f5662c916e6e98d21d141eb13 | [log] [tgz] |
|---|---|---|
| author | Elliott Hughes <enh@google.com> | Sun Oct 15 08:47:40 2017 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Sun Oct 15 08:47:40 2017 +0000 |
| tree | a754d1496b6e0c1c69057b66f0ccffe47faf84a7 | |
| parent | e942480e8810c756ff4bf9005fd61135ffb280ea [diff] | |
| parent | 02cc0ecc732a33a33570ec490c44a686354c512b [diff] |
resolve merge conflicts of 58fc59b91c to oc-mr1-dev-plus-aosp am: 02cc0ecc73 Change-Id: I773e8c76620ea084775a3bb1e4fa0e2b5ff91cfa