tree f3da1a8f09de6dbe491b31ea3693307aeffe4b32
parent a696dcad2d106f69e953e6e18648554ca4584486
parent a71a3cefabcce653caecf005dd0dd1a7d15afb7c
author Xin Li <delphij@google.com> 1633655988 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1633655988 +0000

[automerger skipped] Merge "Merge Android 12" am: a71a3cefab -s ours

am skip reason: Merged-In I972cce490ce5f64ed513b7c8b6b7ed1a884af731 with SHA-1 a696dcad2d is already in history

Original change: https://android-review.googlesource.com/c/platform/tools/base/+/1847925

Change-Id: I73bd19fcdd16932144195def80af306448c2fbc4