tree 09010430f6535d9acf25f7266035f50bcf94fb9d
parent 8f8ba91d4744cb5e01818b6e764e257151459458
parent 12db30c41546e1929a8c84aa52add0ee6c411fc4
author Xin Li <delphij@google.com> 1599796726 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1599796726 +0000

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