[automerger skipped] Merge sc-dev-plus-aosp-without-vendor@7634622 am: 1a7761431d
-s ours
am skip reason: Merged-In I8d13832dd297c5ca7ddeb87fb5302e5bad82c309 with SHA-1 920309b25f
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/libhardware/+/15571696
Change-Id: I38a17ffc270cc365a8b17315149d236fd4696035
This commit is contained in:
commit
ceff5ecf17