tree dd68d54734eb8fe5f4aa749f7f9d55dd5b138de7
parent 29cdd9bb46437ab580deabf33b2242106e0090b6
parent c3dcf1007aa964f825b2ea2ef86acb7f332e748f
author Igor Murashkin <iam@google.com> 1395782606 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1395782606 +0000

am c3dcf100: (-s ours) am 65550a0e: am 0370be96: DO NOT MERGE: camera: Fix setParameters for Preview FPS single/range values

* commit 'c3dcf1007aa964f825b2ea2ef86acb7f332e748f':
  DO NOT MERGE: camera: Fix setParameters for Preview FPS single/range values