Merge changes I52e67161,I97547674,If04eb3af,I5e3dd4f1,I8dddc167 into jb-mr1-dev
authorRebecca Zavin <rebecca@android.com>
Wed, 22 Aug 2012 06:48:20 +0000 (23:48 -0700)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Wed, 22 Aug 2012 06:48:20 +0000 (23:48 -0700)
commit6654c251cc67f47ecd211ab4a77403c247ac11fe
treeb1eba5646776144bf8f0aaf7858069652e109a65
parenteba34a93004e81973d22d7523a0edf3eb79b8445
parent2bdec0603559f57a420e8926da22cc437e1336ec
Merge changes I52e67161,I97547674,If04eb3af,I5e3dd4f1,I8dddc167 into jb-mr1-dev

* changes:
  hardware: samsung_slsi: libcamera2: Add SceneMode support
  hardware: samsung_slsi: libcamera2: Add AF/CAF Feature
  hardware: samsung_slsi: libcamera2: 4th release of camera
  hardware: samsung_slsi: libcamera2: Remove memcpy for JPEG output
  hardware: samsung_slsi: libcamera2: Add support for metadata