tree 310b2de934ad5d1159eab3f7f5d4286e791c9ad4
parent 2b454ef29086f0715272bb409c8ac9c05d2b7ff5
parent f9a714f26f6df836d75929af2720f17bcd68156a
author Xin Li <delphij@google.com> 1602214952 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1602214952 +0000

[automerger skipped] Skip ab/6749736 in stage. am: ffd3512684 -s ours am: f9a714f26f -s ours

am skip reason: Change-Id Iebd42fc59e882ca050d453ba1f38f78b166e1ecb with SHA-1 9a3ad2dac6 is in history

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

Change-Id: I5df535c3111efa63e33718484b746af5534a40e2