tree ad6dfde3114a14329871f3e1bf85f3bf1b08cff7
parent fba2cd466a6a2db134a494072d3cc0783df62973
parent 93128a12f2c3b7bd9dfe48fbea6a29e3c0d4fd60
author Xin Li <delphij@google.com> 1656547308 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1656547308 +0000

[automerger skipped] Merge tm-dev-plus-aosp-without-vendor@8763363 am: 47d9ef0a22 -s ours am: 0dbe1c87c1 -s ours am: 93128a12f2 -s ours

am skip reason: Merged-In Ide4d8b5e74c27da5b38d8ad7d3a2dc47409e5cd6 with SHA-1 7b76fb7761 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/tools/tradefederation/contrib/+/19094792

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