tree 645caaa58781c56c71e7f9342df448d4ec0f0d93
parent c4c217303774371a67b4c1e4d754658b7e2aedf1
parent f8d6bfd1b999df799a473d9fecd451fdfceece8d
author Xin Li <delphij@google.com> 1646734925 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1646734925 +0000

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

am skip reason: Merged-In I513aa15f5d655ac3fbb535797659d3654ccfec5e with SHA-1 bf674ec373 is already in history

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

Change-Id: Ib81de7f10430f79d203fd8129633b36689930e47