tree 2f654602d6f3f91e0a5b497f7a84103de7d62e51
parent 0da0aaa9a8fb79bf5a7c4e18fb6d002436fa64a6
parent 6a677c73af7e1ce3c72a322ab83fbd9566edb7e4
author Xin Li <delphij@google.com> 1644612442 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1644612442 +0000

[automerger skipped] Empty merge of sc-v2-dev-plus-aosp-without-vendor@8084891 am: 541b60ca79 -s ours am: 6a677c73af -s ours

am skip reason: Merged-In Id0af0de2b34bff7ab117127c69f8cb9e3b6cc42c with SHA-1 44133e7d73 is already in history

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

Change-Id: Id1e3414ef6d25f2bfa5291d8d3f8197bc8b934e7