tree f919c25c65c01caa34fe13b547b5742face2ce15
parent 2b312b525e6f2a123deb3aac64ab95b237f8349e
parent ec30c30bcb87c1686856418ee52a2a512ceb624e
author Treehugger Robot <treehugger-gerrit@google.com> 1629855297 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1629855297 +0000

Merge "Fix CameraHidlTest" am: eb86f93f53 am: efba724466 am: 22557982dd am: 5b4752b837 am: ec30c30bcb

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

Change-Id: I0e7c95d89cde77f340c2bbc063b5cd52ce78f01c