| commit | da8d7a1836f2ebd986e37a23ed8fcadf58f3a7b8 | [log] [tgz] |
|---|---|---|
| author | Xin Li <delphij@google.com> | Sat Oct 26 22:07:32 2019 -0700 |
| committer | android-build-merger <android-build-merger@google.com> | Sat Oct 26 22:07:32 2019 -0700 |
| tree | 182b164a161ba3163b48c2774d5f5bea1afc29e1 | |
| parent | ae5e519fd99106268a3ca88d567be5f79f42cb5d [diff] | |
| parent | ce64df18175bf3999702c9b13925ab99ea66bb04 [diff] |
[automerger skipped] Merge Coral/Flame into AOSP master am: ce64df1817 -s ours am skip reason: change_id Ib69d0e28acbb25ef561406c1011aebcac6bb4f5b with SHA1 ae5e519fd9 is in history Change-Id: Ia59abbc2980287f40232cfc0bcf25678dbc57f7a