| commit | 20f9569f04784b5619b3f00781cf5cf378f84573 | [log] [tgz] |
|---|---|---|
| author | Xin Li <delphij@google.com> | Sat Oct 26 22:24:39 2019 -0700 |
| committer | android-build-merger <android-build-merger@google.com> | Sat Oct 26 22:24:39 2019 -0700 |
| tree | ff9cd788964c144f7de6060957c07abd3d5f00c8 | |
| parent | e06f2b86058dd77d9e7aaa14ab74ef0068f3840e [diff] | |
| parent | a70440ad47691968bf0111d54207bcc8041cfd8f [diff] |
[automerger skipped] Merge Coral/Flame into AOSP master am: 16ec740024 -s ours am: 625d89b16a -s ours am: a70440ad47 -s ours am skip reason: change_id Idf98a5af41c1436011f226631278afbc60290c2b with SHA1 77309054b2 is in history Change-Id: I7c2a6f0109f49009920a53fbfc6272d8ac377807