[automerger skipped] Merge Android R (rvc-dev-plus-aosp-without-vendor@6692709) am: 936c77642d -s ours am: aa6ee6a69a -s ours am: ea9f4a294f -s ours

am skip reason: Change-Id I5081765a1f7067786819df994029cd37a56ec570 with SHA-1 241bea678f is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/libhardware_legacy/+/12470018

Change-Id: Iaadab5c4458d21648f7885078030853357dff132
This commit is contained in:
Xin Li 2020-09-01 22:09:43 +00:00 committed by Automerger Merge Worker
commit 8f8ba91d47

Diff content is not available