tree a20d404b45ddb071d30565efe08ed0137d03ec82
parent 7c13fc86d1423706b5b279de4f9c0b091a443e27
parent cf91d4b9b965768de3e1459db17b29dacc1f2f25
author TreeHugger Robot <treehugger-gerrit@google.com> 1607014588 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1607014588 +0000

Merge "Camera: Document behavior when cropRegion and zoomRation conflict" into rvc-qpr-dev am: cf91d4b9b9

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13145508

Change-Id: Iacdbb68dfd551718cf513e887211c82297d8f651