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