| commit | 5cc5b1d665cb6743056210ee9fe27522eb3cdf35 | [log] [tgz] |
|---|---|---|
| author | Xin Li <delphij@google.com> | Sat Oct 26 22:53:21 2019 -0700 |
| committer | android-build-merger <android-build-merger@google.com> | Sat Oct 26 22:53:21 2019 -0700 |
| tree | 4c827da1dc16242988b590118c48b14aed09da50 | |
| parent | aed4594af53785607fd2a76ea67b6da0bc31205a [diff] | |
| parent | 8eced4e305ad495aa85c3c0289508eab10319e4f [diff] |
[automerger skipped] Merge Coral/Flame into AOSP master am: 77918ad629 -s ours am: 8eced4e305 -s ours am skip reason: change_id Ia3ddfe73a2fa32723e809f74bb83ff43d2c11df9 with SHA1 1d93206c5b is in history Change-Id: I6b0e9e804ef3fbe3753abdbd20ad44e3fc771e95