| commit | b8858e1d3f76bd392dc94d2145f88331af59b251 | [log] [tgz] |
|---|---|---|
| author | Xin Li <delphij@google.com> | Sat Oct 26 23:18:01 2019 -0700 |
| committer | android-build-merger <android-build-merger@google.com> | Sat Oct 26 23:18:01 2019 -0700 |
| tree | 0cbd748619d0aa78d79a58f466af816484381caf | |
| parent | fef5e325f5ac4a4615ac82b1ea52e470d23b7971 [diff] | |
| parent | e2c2504c9457b19c0896c9247212ea14dba4c5fd [diff] |
[automerger skipped] Merge "Merge Coral/Flame into AOSP master" am: e2c2504c94 -s ours am skip reason: change_id I46ad5cff3809191483b48fe292dba220a0d699c6 with SHA1 5eda5a3e7f is in history Change-Id: Ifc67e1652cb46474a16c6383cec2d81ca6e424d3