tree 523b08ce7b8e8ac9b3a789a00e830a2d792da4b5
parent b7e13719be9dd4c24d163ebe769f09cc4b62e48b
parent c13941a760806deb2d6d4c50c12e2afe47b7bf6d
author Xin Li <delphij@google.com> 1648954066 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1648954066 +0000

[automerger skipped] Merge Android 12 QPR3 ab/8391262 am: f1d510cca0 -s ours am: c13941a760 -s ours

am skip reason: Merged-In I1ec8d6440629e4198a5116641d9074906c6a5ebb with SHA-1 123007c428 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/tools/trebuchet/+/17544699

Change-Id: I989142219a2061b56781d31613f4d121d818bb23
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>