tree 18ce4c5ddff1e76c4dbc8ac93c4560ed46f62f61
parent b8cd41b7c7bb6e1a658d1a1e2b0730b178a39c45
parent 1d08652130d09686f1621d57d82ceaf7b1f9b763
author Xin Li <delphij@google.com> 1633683570 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1633683570 +0000

[automerger skipped] Merge Android 12 am: 608315518e -s ours am: aa41dc490c -s ours am: a5ac08d982 -s ours am: f4f6bb7e63 -s ours am: 1d08652130 -s ours

am skip reason: Merged-In I6ee17a46a996524dae41452ca769c88fdea78e3e with SHA-1 f40dd86e52 is already in history

Original change: https://android-review.googlesource.com/c/platform/system/hwservicemanager/+/1847452

Change-Id: I59720d6f07f1fc7b0e54fcad54c84d729e2e28d8