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

[automerger skipped] Merge sc-dev-plus-aosp-without-vendor@7634622 am: 25583eb8d5 -s ours am: 03287911a8 -s ours am: 175e9a1003 -s ours

am skip reason: Merged-In I7c54a150e6e0eb44d3f81ddc755f49c6dae40fca with SHA-1 d90428555a is already in history

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

Change-Id: I98bca483b3e2d0d1aad54452d2fcd1a68b8e0933