| commit | 4fba1295483df6ee5ced39b2c53bbf69fc679b3b | [log] [tgz] |
|---|---|---|
| author | Xin Li <delphij@google.com> | Sat Oct 26 22:40:51 2019 -0700 |
| committer | android-build-merger <android-build-merger@google.com> | Sat Oct 26 22:40:51 2019 -0700 |
| tree | 22c56c00bb0175f63d1dafee59dcd19389fe42f2 | |
| parent | b482bb92e94f62403cd269f00a35fd3a6d01ce41 [diff] | |
| parent | 457ee2c4c69f5547c677f9133a2b0fbb1559eb5b [diff] |
[automerger skipped] Merge Coral/Flame into AOSP master am: 8021732ca7 -s ours am: fb7d9a4e2f -s ours am: 457ee2c4c6 -s ours am skip reason: change_id I6f659f61e70630236cabf7a00af39ae2c2c7264c with SHA1 6d14b39680 is in history Change-Id: Ic39c5dd3688ba0ca87345fa4b4c9bd97a944383c