Merge "hardware: samsung_slsi: libcamera2: manual focus mode bug fix" into jb-mr1-dev
authorRebecca Zavin <rebecca@android.com>
Tue, 18 Sep 2012 18:31:53 +0000 (11:31 -0700)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Tue, 18 Sep 2012 18:31:54 +0000 (11:31 -0700)

Trivial merge