| commit | 229f77abffdd15c213d144b86bb7ee6bacefc825 | [log] [tgz] |
|---|---|---|
| author | Xin Li <delphij@google.com> | Sat Oct 26 22:37:35 2019 -0700 |
| committer | android-build-merger <android-build-merger@google.com> | Sat Oct 26 22:37:35 2019 -0700 |
| tree | 3b1b9217cf9d5c3a32a0a3c830ea3f88c15fe73c | |
| parent | 0de2363a6fe29b4cc16c0f291f182fb869748454 [diff] | |
| parent | 2b7ba7e4af77fe675e82444b692e9d99eb08edaf [diff] |
[automerger skipped] Merge Coral/Flame into AOSP master am: edd21ffb49 -s ours am: 2b7ba7e4af -s ours am skip reason: change_id I4af5f825051fb85e4c6d58f310d9209036c63ea8 with SHA1 c8782e216f is in history Change-Id: I7fa7159bb18295b7de072d4769118df186e8b2e8