tree 3ba10ad5e7818db58d05890f879bfc28e8a3e387
parent 135115945b9c9ba4a6910a225bd9d4348f298588
parent a7bf9305a27c22c6fd1f8a3037c2ccdfd274cf72
author Eino-Ville Talvala <etalvala@google.com> 1348789089 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1348789089 -0700

am 12d3e887: Merge "Camera2: Fix FPS value scaling between HAL2 and API" into jb-mr1-dev

* commit '12d3e887c6cefcd5ae0abce528ea576950ce6b9f':
  Camera2: Fix FPS value scaling between HAL2 and API