am 6155ddde: Merge "hardware: samsung_slsi: libcamera2: Supports scene mode override...
authorRebecca Zavin <rebecca@android.com>
Wed, 3 Oct 2012 18:51:31 +0000 (11:51 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 3 Oct 2012 18:51:31 +0000 (11:51 -0700)
* commit '6155dddeee557b63e25619719acb460044a22660':
  hardware: samsung_slsi: libcamera2: Supports scene mode override and quirks


Trivial merge