tree 6c63682bd52399ee3cd75c4112c08a4fb7145640
parent aeee790806fa3cd68d3fbdea7286673978563d20
parent 6a07ce5a1329027ac0251bd520f33e01e99ec98e
author Xin Li <delphij@google.com> 1633657192 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1633657192 +0000

[automerger skipped] Merge "Merge Android 12" am: 9a7915509a -s ours am: 6a07ce5a13 -s ours

am skip reason: Merged-In I18fafce9c9c2f412a44dcf9455d886c398c8011a with SHA-1 d40f53277f is already in history

Original change: https://android-review.googlesource.com/c/platform/external/tremolo/+/1847655

Change-Id: I0552e50dd6ea34f56e5f289a0f93afa989a8de35