tree 09010430f6535d9acf25f7266035f50bcf94fb9d
parent ea9f4a294fecd23d94be101ae0ee5493456233da
parent fb376639c3e76cec3e5297bd23080533173d422e
author Xin Li <delphij@google.com> 1599795195 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1599795195 +0000

[automerger skipped] Merge "Merge Android R" am: cff73710d4 -s ours am: b8799f91f5 -s ours am: fb376639c3 -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: I0245f892a00f5c51c8d0a0d9bdf2e53de833b6ec