tree d71d13c7fb333c7a6419eb7f3ee1fef422ec87cc
parent 685d3750394c2b8480a25d08493ec006f30e937e
parent e59b183159feff12bbf4a92a566f8816f86dfd9e
author Xin Li <delphij@google.com> 1633683604 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1633683604 +0000

[automerger skipped] Merge "Merge Android 12" am: 4d35a9054f -s ours am: 722cdc84c9 -s ours am: 1d3e3083bb -s ours am: 621469a1c6 -s ours am: e59b183159 -s ours

am skip reason: Merged-In I25227a7fb2fa4341f901e9e152fc2d85aac5f432 with SHA-1 25583eb8d5 is already in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/wilhelm/+/1847164

Change-Id: I762c7ec968c9f12a8fce7bca36f1e25fd7774f86