tree 66ec966958ebd47eed4dc5d05eda27f6282983e2
parent 855a611f5bae6b333065a0c45cbf93d2b182f2f6
parent 97288af7dd3c3606ec82ae933f0e0a951a00804a
author Xin Li <delphij@google.com> 1660691972 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1660691972 +0000

[automerger skipped] Merge "DO NOT MERGE - Merge Android 13" am: 97288af7dd -s ours

am skip reason: Merged-In I366c543e85a62f878908836e9ad1914182dc9e6f with SHA-1 045e21dfc1 is already in history

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

Change-Id: Ic3eb433e850f75fcfa713b07f6d4d25ef56cbec1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>