tree f3da1a8f09de6dbe491b31ea3693307aeffe4b32
parent 8d0898b780312fc8cfd18407ac12a6ec152e0b07
parent 37f8ca3ee8cbe76046577d79c35e503a1b482f40
author Xin Li <delphij@google.com> 1633679789 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1633679789 +0000

[automerger skipped] Merge "Merge Android 12" am: a71a3cefab -s ours am: 3db7f818bd -s ours am: 37f8ca3ee8 -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: I3f1a3297a8b02538c558b2b7ccb94f86e5344fde