| commit | 806c2eb4e2fdf27e4afc15bc5a6df08bbfd8af0f | [log] [tgz] |
|---|---|---|
| author | Xin Li <delphij@google.com> | Sat Oct 26 22:03:21 2019 -0700 |
| committer | android-build-merger <android-build-merger@google.com> | Sat Oct 26 22:03:21 2019 -0700 |
| tree | 0d442806bc9945dd949680161f3687441b66331f | |
| parent | 7e2505b25395ec1499b548399bb071ec9dcc3fdd [diff] | |
| parent | 992d7f5e53a7dd1759b80ba2a019a16a06a277bd [diff] |
[automerger skipped] Merge Coral/Flame into AOSP master am: b775825c4e -s ours am: d195bbfe68 -s ours am: 992d7f5e53 -s ours am skip reason: change_id If197304fa91f97ad78cbb9e0ea912cbc7d81e96b with SHA1 3b7114c4f2 is in history Change-Id: I7ac4e8b227a181f85b43d1465daba6f4864e5c3d