commit e3d9612feeff7fd8a8b9cd6d6619057632562359
author Rebecca Zavin <rebecca@android.com> Wed Sep 26 11:46:29 2012 -0700
committer Android Git Automerger <android-git-automerger@android.com> Wed Sep 26 11:46:29 2012 -0700
tree 61bf5d3313eba01f7b0882fb0d45d895bf02995f
parent bde52ea09dbb91fdd9c4c41767eb5c0c9bdaf6f3
parent 995123306ca66fed4af59cb7d466c9cbaf931dd6

am 99512330: am 87424342: Merge changes I970f5995,I2cf7120a,I2118dee2,Ib6082faa,Iad063164,If454186d,If189904f,I261e454e into jb-mr1-dev

* commit '995123306ca66fed4af59cb7d466c9cbaf931dd6':
  hardware: samsung_slsi: libcamera2: Fix capture aspect ratio bug
  hardware: samsung_slsi: libcamera2: Change ISP streamoff sequence
  hardware: samsung_slsi: libcamera2: update meta data region
  hardware: samsung_slsi: libcamera2: Fix frame completion scheme
  hardware: samsung_slsi: libcamera2: Preserve SCC info on res change.
  hardware: samsung_slsi: libcamera2: change min fd score value for meta data
  hardware: samsung_slsi: libcamera2: support face priority scene mode
  hardware: samsung_slsi: libcamera2: support flash off mode with ZSL