tree 8a341bc9633a078bd01b5d1f27b5ad723b5e5925
parent b8dcfa71090a55bbf5db054130da5018d20b3788
parent 87db7a7c5e9ad58d2137d33997502815d394b678
author Xin Li <delphij@google.com> 1633679835 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1633679835 +0000

[automerger skipped] Merge "Merge Android 12" am: 9044c51dd8 -s ours am: 696c17aedc -s ours am: 87db7a7c5e -s ours

am skip reason: Merged-In Ied4e7a153b46e23aaca665b7812fafb2449357e2 with SHA-1 d388fa6ead is already in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/ex/+/1847574

Change-Id: I5653774c042ca09c20be448de2a706a73a22d437