| commit | 6db6de3080950d3465bf5d7d3b71be699cb2ec4f | [log] [tgz] |
|---|---|---|
| author | Xin Li <delphij@google.com> | Fri Sep 11 02:03:04 2020 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Sep 11 02:03:04 2020 +0000 |
| tree | 1dbb8fda46435d5a29f43791efd5fd4f3e0c656d | |
| parent | 2fc0a7eb60f077c6e04e295f8ec7c7a9d668c5c1 [diff] | |
| parent | 888d0531c26e471a02355ae3e11bb93ad2317e77 [diff] |
[automerger skipped] Merge "Merge Android R" am: a81b123780 -s ours am: 888d0531c2 -s ours am skip reason: Change-Id Idd09cd2ecd3045625f3c10c41cad2f2af7850dd5 with SHA-1 7e7631299c is in history Original change: https://android-review.googlesource.com/c/platform/external/tremolo/+/1422390 Change-Id: Ib0c50876af4b3c31cfc3a97cdaf2a9dd4c66e58f