tree 1dbb8fda46435d5a29f43791efd5fd4f3e0c656d
parent 2fc0a7eb60f077c6e04e295f8ec7c7a9d668c5c1
parent 888d0531c26e471a02355ae3e11bb93ad2317e77
author Xin Li <delphij@google.com> 1599789784 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1599789784 +0000

[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