tree 865b6bded5c4b45bfb769d2eeebd64e5ac8c7b1d
parent 96fc5e5140d230a77b94b13a6aaef19686885836
parent e32bf6cd28d6d812adbeefb039987cba670b3363
author TreeHugger Robot <treehugger-gerrit@google.com> 1591390722 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1591390722 +0000

Merge "Camera: Avoid enabling unsupported CAF modes during image capture" into rvc-dev am: 1a463d7444 am: e32bf6cd28

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Camera2/+/11707502

Change-Id: I2505d13b643689cc2f1698a1b8d76249d9a86d2f