tree b2a72cfbe17eebd009bcb5eeb5a811d77c7581fe
parent d26f2641df1674269e0f182502d7cc81885afbba
parent eb0d12784e307ce9942d4f76733de6065f992c8a
author Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1659576094 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1659576094 +0000

Merge "Merge "Camera CTS: Fix camera id checks for FEATURE_CONCURRENT_CAMERA" into android11-tests-dev am: fed8c88d74" into android12-tests-dev am: eb0d12784e

Original change: https://android-review.googlesource.com/c/platform/cts/+/2168982

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