tree 4803a14400f23945906ed679e65e19cb89095e8f
parent 8208ef1b2ccf6ff247b7a448d48e5e3af28fa075
parent 2378c6cbb39d1c37e7978ff4e398aa2d0bcb0801
author Xin Li <delphij@google.com> 1614810563 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1614810563 +0000

[automerger skipped] Merge "Merge RQ2A.210305.007" am: 2378c6cbb3 -s ours

am skip reason: Change-Id I619e01ef90e4f0b5c9dd5f794edf269deacb4324 with SHA-1 8208ef1b2c is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I7418dbc93b1eb5f241dec45e8492785b6a232e19