Merge "hardware: samsung_slsi: libcamera2: ZSL Bug fixes" into jb-mr1-dev
authorRebecca Zavin <rebecca@android.com>
Thu, 20 Sep 2012 18:05:27 +0000 (11:05 -0700)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Thu, 20 Sep 2012 18:05:28 +0000 (11:05 -0700)

Trivial merge