| commit | 64c759c6ec83818e37a6547b19bb12107f0ef72f | [log] [tgz] |
|---|---|---|
| author | Xin Li <delphij@google.com> | Sat Oct 26 22:24:21 2019 -0700 |
| committer | android-build-merger <android-build-merger@google.com> | Sat Oct 26 22:24:21 2019 -0700 |
| tree | 0754f1956ab0ea68a7b2e2e14d6be48b5c5ff257 | |
| parent | 59ef1c5ec218a875b785bce7a4c8ac20c5be9a29 [diff] | |
| parent | db0ba00fa84fa852d6a358dd5cb546f7583612c3 [diff] |
[automerger skipped] Merge Coral/Flame into AOSP master am: bc6ec2f120 -s ours am: bf0b0c4a9f -s ours am: db0ba00fa8 -s ours am skip reason: change_id I80e239bb17ad31c71f8dc632a3233e34dd5b9825 with SHA1 03c8fb1420 is in history Change-Id: Ibb15434022a81981c2284e47e66a65924b419b96