tree 18ce4c5ddff1e76c4dbc8ac93c4560ed46f62f61
parent 611a4c2101b96a0c7234e1649590a7951e86b4e9
parent f4f6bb7e6304df7b62b95c49ee34522f3d84124f
author Xin Li <delphij@google.com> 1633681759 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1633681759 +0000

[automerger skipped] Merge Android 12 am: 608315518e -s ours am: aa41dc490c -s ours am: a5ac08d982 -s ours am: f4f6bb7e63 -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: I9d17ae32880fd5cec35d0e6e02f44276bc0c9299