tree 18ce4c5ddff1e76c4dbc8ac93c4560ed46f62f61
parent 2a86ce9bec5535de48f5a047dc706feb3aee7515
parent a5ac08d98211d8f10d65f7bc667cc86bbda2569a
author Xin Li <delphij@google.com> 1633679781 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1633679781 +0000

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