am 995bbd51: Merge "hardware: samsung_slsi: libcamera2: AE lock bug fix" into jb...
authorRebecca Zavin <rebecca@android.com>
Mon, 1 Oct 2012 22:44:25 +0000 (15:44 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Mon, 1 Oct 2012 22:44:25 +0000 (15:44 -0700)
* commit '995bbd512ac29912894158067e3fc44d3ceb000a':
  hardware: samsung_slsi: libcamera2: AE lock bug fix


Trivial merge