tree c2afa35bd2da06539e6af4629b6060cb424da10e
parent dfdd6bf000d80d33b1ff5d596ae254c484b54298
parent e4249e6acbc741dbd0d1802c83c74a4bc4731f17
author Xin Li <delphij@google.com> 1696582990 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1696582990 +0000

[automerger skipped] Merge "Merge Android 14" into main am: 6e5271930f -s ours am: e4249e6acb -s ours

am skip reason: Merged-In I086eec8d1726b9f0c42a7b1a26dfcc93f394106e with SHA-1 40fa6e18cd is already in history

Original change: https://android-review.googlesource.com/c/platform/hardware/libhardware/+/2775005

Change-Id: Ibcee5641cb0c4efd175538c1a43382749a9d4088
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>