am 2f9c21c5: Merge "hardware: samsung_slsi: libcamera2: Remove fixed-FPS for recordin...
authorJames Dong <jdong@google.com>
Wed, 17 Oct 2012 23:38:41 +0000 (16:38 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 17 Oct 2012 23:38:41 +0000 (16:38 -0700)
commit386c0203dc459d296430c520636ecf57be97b7c0
tree322ecb3b76fa8128fba4a6c08af2e8fe515c7e05
parentfd75ce97c008976f763d5106e03bc61d2b375093
parent2f9c21c521cf8b1bc242ad365fc0e3fe31be5979
am 2f9c21c5: Merge "hardware: samsung_slsi: libcamera2: Remove fixed-FPS for recording mode" into jb-mr1-dev

* commit '2f9c21c521cf8b1bc242ad365fc0e3fe31be5979':
  hardware: samsung_slsi: libcamera2: Remove fixed-FPS for recording mode