tree 1f2585355ee371fb495e5ff4be8c87765937b6f9
parent 30ae899f684e0ddc31576ed67bf5ef41eaffd01f
parent a290191b7b9846ae5648e74bf8df8f496484cea3
author Igor Murashkin <iam@google.com> 1349727344 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1349727344 -0700

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

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