| commit | bfcfc969f4d1ebb45aeee88e3129bbaa1b843346 | [log] [tgz] |
|---|---|---|
| author | Xin Li <delphij@google.com> | Sat Oct 26 23:38:17 2019 -0700 |
| committer | android-build-merger <android-build-merger@google.com> | Sat Oct 26 23:38:17 2019 -0700 |
| tree | eda59c6f3ab5a0b1c85f14c548acd2b76dbfafad | |
| parent | f5c9422d183aa658270d3805cd8af17962774227 [diff] | |
| parent | 70aff23c402e0c03bfda577ce01aa6051a13cf90 [diff] |
[automerger skipped] Merge Coral/Flame into AOSP master am: 52bb254eea -s ours am: fef5e325f5 -s ours am: 5f29ade8a8 -s ours am: 70aff23c40 -s ours am skip reason: change_id I46ad5cff3809191483b48fe292dba220a0d699c6 with SHA1 5eda5a3e7f is in history Change-Id: I7f8d5e2ba644d96e81db7dd22fe1714a22b0d9f7