Merge "Add Faces and Lens Dist. info to photoCaptureDone" into ub-camera-haleakala

author I-Jong Lin <ijonglin@google.com>

Mon, 23 Mar 2015 23:23:38 +0000 (23:23 +0000)

committer Android (Google) Code Review <android-gerrit@google.com>

Mon, 23 Mar 2015 23:23:38 +0000 (23:23 +0000)
author I-Jong Lin <ijonglin@google.com>
Mon, 23 Mar 2015 23:23:38 +0000 (23:23 +0000)
committer Android (Google) Code Review <android-gerrit@google.com>
Mon, 23 Mar 2015 23:23:38 +0000 (23:23 +0000)
diff --cc src/com/android/camera/CaptureModule.java
Simple merge
diff --cc src/com/android/camera/PhotoModule.java
Simple merge
diff --cc src/com/android/camera/VideoModule.java
Simple merge
author	I-Jong Lin <ijonglin@google.com>
	Mon, 23 Mar 2015 23:23:38 +0000 (23:23 +0000)
committer	Android (Google) Code Review <android-gerrit@google.com>
	Mon, 23 Mar 2015 23:23:38 +0000 (23:23 +0000)
		1	2
src/com/android/camera/CaptureModule.java	patch \|	diff1 \|	diff2 \|	blob \| history
src/com/android/camera/PhotoModule.java	patch \|	diff1 \|	diff2 \|	blob \| history
src/com/android/camera/VideoModule.java	patch \|	diff1 \|	diff2 \|	blob \| history