Merge "hardware: samsung_slsi: libcamera2: Remove fixed-FPS for recording mode" into...
authorJames Dong <jdong@google.com>
Wed, 17 Oct 2012 23:34:55 +0000 (16:34 -0700)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Wed, 17 Oct 2012 23:34:55 +0000 (16:34 -0700)

Trivial merge