[automerger skipped] Merge "[RESTRICT AUTOMERGE] Modify CameraUseStreamConfigToDisplay" into android11-tests-dev am: 72b6e65914
-s ours am: fcec28ee4c
-s ours am: 08af1350ce
-s ours am: 7d4805ed3b
-s ours am: 01a1a1c2a0
-s ours am: 2f8b18593d
-s ours am: 1d6d4f3c17
-s ours am: 48ee487e6a
-s ours
am skip reason: contains skip directive Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2555892 Change-Id: Id35ddee26304edd12838f1acb3317a145110ecb4 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
commit
9919530581