am b8fa1240: am aa9e3e01: Camera: Play shutter sound iff enableShutterSound(true...

author Igor Murashkin <iam@google.com>

Wed, 28 Nov 2012 01:34:23 +0000 (17:34 -0800)

committer Android Git Automerger <android-git-automerger@android.com>

Wed, 28 Nov 2012 01:34:23 +0000 (17:34 -0800)
author Igor Murashkin <iam@google.com>
Wed, 28 Nov 2012 01:34:23 +0000 (17:34 -0800)
committer Android Git Automerger <android-git-automerger@android.com>
Wed, 28 Nov 2012 01:34:23 +0000 (17:34 -0800)
diff --cc services/camera/libcameraservice/Camera2Client.cpp
Simple merge
diff --cc services/camera/libcameraservice/camera2/CaptureSequencer.cpp
Simple merge
author	Igor Murashkin <iam@google.com>
	Wed, 28 Nov 2012 01:34:23 +0000 (17:34 -0800)
committer	Android Git Automerger <android-git-automerger@android.com>
	Wed, 28 Nov 2012 01:34:23 +0000 (17:34 -0800)
		1	2
services/camera/libcameraservice/Camera2Client.cpp	patch \|	diff1 \|	diff2 \|	blob \| history
services/camera/libcameraservice/camera2/CaptureSequencer.cpp	patch \|	diff1 \|	diff2 \|	blob \| history