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

[automerger skipped] Merge sc-dev-plus-aosp-without-vendor@7634622 am: f40dd86e52 -s ours am: c4e2c55d52 -s ours

am skip reason: Merged-In I937e1382b9968adff860f2295cb4052f8d183436 with SHA-1 e532e00132 is already in history

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

Change-Id: I16ad678d7c67d11631bf625d50268921b2b805b2