tree 46509c08c174610e98893ffa5a35e71b3fdf9354
parent 8aad5495823d489401df8b8b6f4d32aad683f16f
parent 07cc78fe7dee9a96cd33865de890d0890fe752d7
author Igor Murashkin <iam@google.com> 1349727265 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1349727265 -0700

am 4c9aeb21: Merge "Camera2: Fix Parameters#setZoom off by 1 validation error" into jb-mr1-dev

* commit '4c9aeb21051e908b0a0a0864a04a96a4109717a1':
  Camera2: Fix Parameters#setZoom off by 1 validation error