tree 9dd373ee8429ca61577e2e033b65aa734cd7f8cb
parent 396e48747c9b0b76a0509c6f78af7108b7792717
parent 505723d5d197254b68deb0e984bd3d59ec9e5ad5
author Treehugger Robot <treehugger-gerrit@google.com> 1654729030 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1654729030 +0000

[automerger skipped] Merge changes from topic "226452499" into android12-tests-dev am: 970cccb939 am: 94755b9007 -s ours am: 7dafb3d92e -s ours am: 59a552857a -s ours am: 3b9163644f -s ours am: 1a65ec9358 -s ours am: 505723d5d1 -s ours

am skip reason: Merged-In I5ef42c922a0b0a037d2cf70ca83790fc95196ccb with SHA-1 cf52cb0307 is already in history

Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2099117

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