| commit | 6bb7a2f5a3d9daea9b10e20d1c568f49b01a2e81 | [log] [tgz] |
|---|---|---|
| author | Xin Li <delphij@google.com> | Sat Oct 26 22:37:45 2019 -0700 |
| committer | android-build-merger <android-build-merger@google.com> | Sat Oct 26 22:37:45 2019 -0700 |
| tree | 33c2e88f3ff23a1620fc15a2011c11c781fd7148 | |
| parent | 34a19c6a98f22d5bbfdba4503977128e56d8832b [diff] | |
| parent | b01dfec50c1016d4e18ed6c96b96eedd11db3c41 [diff] |
[automerger skipped] Merge Coral/Flame into AOSP master am: 2dd444c395 -s ours am: 8a20d7acc0 -s ours am: 2ec685c0d0 -s ours am: b01dfec50c -s ours am skip reason: change_id I911b1a53ec46f39cc7597c2a31f59669db4f0699 with SHA1 e66c67c549 is in history Change-Id: I580b0d0a3a14cb49e4b4180935b5d671a1d31405