| commit | 4e4f227db57822747b097c83096f5590b4f90772 | [log] [tgz] |
|---|---|---|
| author | Xin Li <delphij@google.com> | Sat Oct 26 22:18:00 2019 -0700 |
| committer | android-build-merger <android-build-merger@google.com> | Sat Oct 26 22:18:00 2019 -0700 |
| tree | cd524d1c44ed5ba56e86e6ff9a0fbf7505cc0160 | |
| parent | 369e00fdff2aa19a4f88d547078040b6b76d132c [diff] | |
| parent | 0c37961c4e18cc0cfd5ba7cb3c8add4c833492d5 [diff] |
[automerger skipped] Merge Coral/Flame into AOSP master am: 53d4c6dbc5 -s ours am: 96e07a57d9 -s ours am: 0c37961c4e -s ours am skip reason: change_id I26e13dd88b006577b73f2528aaa5940492f45f7c with SHA1 de05c1aee5 is in history Change-Id: Ia48fea6b5b6faac0476a2529f68db119d47627fe