tree f14c020b6749c328e11e369b555b11965a375e22
parent f25b4810ef222e3559dded9b4225f238fc9a24d5
parent 0ba7cd85016caac178ee8e52f067ca9c42511dc3
author Emilian Peev <epeev@google.com> 1491827167 +0000
committer android-build-merger <android-build-merger@google.com> 1491827167 +0000

Merge "Camera: Don't advertize zoom in case max digital zoom is 1" into oc-dev
am: 0ba7cd8501

Change-Id: I010fc3f3e0e8519662dcd8eb8ce3cd547a1375fa