tree 46a6d340c53d08a5ce6a98e852357936044ea561
parent 175e9a1003e892de548477377b59f1640c2445b6
parent 1d3e3083bb092f23e046877a4e82db85bde2977a
author Xin Li <delphij@google.com> 1633679815 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1633679815 +0000

[automerger skipped] Merge "Merge Android 12" am: 4d35a9054f -s ours am: 722cdc84c9 -s ours am: 1d3e3083bb -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: I2bb0e028081c3a1000f46f91860cb67cf6075fa7