tree 13f4148a1bc36b0292c50c303dc9aab2fbc2925c
parent 6669d4a4dd99b9e3555e21797bc35bee84300e77
parent 3716cc361f0e58944401e91114ffbf756ba44c26
author Xin Li <delphij@google.com> 1639517061 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1639517061 +0000

[automerger skipped] Merge "Merge Android 12 QPR1" am: b635a149bb -s ours am: 3716cc361f -s ours

am skip reason: Merged-In I7a7c71438880823616a1e696dde71fbfc25a9375 with SHA-1 c5f7a68758 is already in history

Original change: https://android-review.googlesource.com/c/platform/development/+/1921885

Change-Id: I88942fdeea21cacde4ab3f6658e95786f3b3a815