[automerger skipped] Merge "Merge Android R" am: 02dfcc7c15
-s ours am: 5f3a19f76a
-s ours am: 51eba9d0f1
-s ours
am skip reason: Change-Id Ib50a9978c77eda7e20e27f2d63615599f0517b6d with SHA-1 fae361f24e
is in history
Original change: https://android-review.googlesource.com/c/platform/hardware/libhardware/+/1422436
Change-Id: I06fc514a2fe82c1826fefaab9b80ddf718339690
This commit is contained in:
commit
c1e843d407