tree 5501d3c5afbd78ef1ccb6f50c7f9f273262653cc
parent de799a74064a363d26f4c1bbc5a59d1b7127f49f
parent c9d7e4da3f963dadbea19e9b520fb7a7e28e614a
author Eino-Ville Talvala <etalvala@google.com> 1348788975 -0700
committer Android (Google) Code Review <android-gerrit@google.com> 1348788976 -0700

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