OSDN Git Service

[automerger skipped] Merge "Merge Coral/Flame into AOSP master" am: b2198fa670 -s...
authorXin Li <delphij@google.com>
Sun, 27 Oct 2019 06:14:13 +0000 (23:14 -0700)
committerandroid-build-merger <android-build-merger@google.com>
Sun, 27 Oct 2019 06:14:13 +0000 (23:14 -0700)
commit058be5620e2221ad2d6f09d7202d905be02ba858
tree2d0da7d0460ce47730553090ec27cd65fb8ab460
parent7e2bffda1a58fa276b4152c5fbfef55f63dfa48b
parenta958184a3147f2a0ee57ebe3549cc41d0b30e80c
[automerger skipped] Merge "Merge Coral/Flame into AOSP master" am: b2198fa670 -s ours
am: a958184a31 -s ours
am skip reason: change_id Ibe8ff7bdba7a886bd8b91155ae56f087a836981f with SHA1 af8a6c724f is in history

Change-Id: I92eabc9cf3b76c39eab3cbd1a79572dc34ca0a5e