[automerger skipped] Merge "Merge Android R" am: cff73710d4
-s ours
am skip reason: Change-Id Ia45f259338a1f8255e22c7ba6125e8149eaa9081 with SHA-1 936c77642d
is in history
Original change: https://android-review.googlesource.com/c/platform/hardware/libhardware_legacy/+/1422399
Change-Id: Iee6dab710c007de5b0f841a87004163aa2fc3e28
This commit is contained in:
commit
b8799f91f5