tree 959f5c2f87c4d25cd27a1cdb2c79c9f433bdbd3b
parent ff9b0f125920c698964ae919ed06d2bfdd488e37
parent a02f04d0c842214f6a62260ca5737d2f3696a0df
author Xin Li <delphij@google.com> 1639520371 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1639520371 +0000

[automerger skipped] Merge "Merge Android 12 QPR1" am: c0723d7fb4 -s ours am: 2d0a6ccd09 -s ours am: 8607521de4 -s ours am: a02f04d0c8 -s ours

am skip reason: Merged-In I855f1f0b6bd10d54941d56889eb6b025ac11a693 with SHA-1 9fb33388af is already in history

Original change: https://android-review.googlesource.com/c/device/common/+/1921920

Change-Id: I844e738a534d6120e9098821b13ed6a90f65d649