From: Eino-Ville Talvala <etalvala@google.com>
Date: Thu, 27 Sep 2012 23:38:09 +0000 (-0700)
Subject: am 12d3e887: Merge "Camera2: Fix FPS value scaling between HAL2 and API" into jb... 
X-Git-Tag: android-x86-4.4-r1~23^2~80^2~156
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=cf71c743e58015966b4750ebc53e2a7672cf080c;p=android-x86%2Fframeworks-av.git

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
---

cf71c743e58015966b4750ebc53e2a7672cf080c