tree 865b6bded5c4b45bfb769d2eeebd64e5ac8c7b1d
parent af61762b41936b15f7d67b8d7a2cfb057f647aab
parent 310290da836dcd6fe8cfe1cc2d07b6af37a2db07
author TreeHugger Robot <treehugger-gerrit@google.com> 1591390742 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1591390742 +0000

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

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

Change-Id: I3364c2c76c6d97f01f7f8c8535015ef9d1bc140a