| commit | 7b9d907b2b642998a6b1092b70185d4e5590e813 | [log] [tgz] |
|---|---|---|
| author | Xin Li <delphij@google.com> | Sat Oct 26 23:11:20 2019 -0700 |
| committer | android-build-merger <android-build-merger@google.com> | Sat Oct 26 23:11:20 2019 -0700 |
| tree | 30713e4aa4cacf65cc8f7ab6f6415db33297e13f | |
| parent | 09ad73a386c110b374dadaec343371aa59f823c9 [diff] | |
| parent | d8368c7ee91ae875069f8c2aa675fab09ce1f631 [diff] |
[automerger skipped] Merge "Merge Coral/Flame into AOSP master" am: 7512fc4407 -s ours am: d8368c7ee9 -s ours am skip reason: change_id Ia414339f44c010134faf02d87bcbfba140165398 with SHA1 6e1b2be2f5 is in history Change-Id: I7ba1d900e08829350cd929a2130c8c9ece24baf2