Merge "Camera2: Update android.blackLevel.lock"

author Eino-Ville Talvala <etalvala@google.com>

Mon, 30 Dec 2013 20:55:23 +0000 (20:55 +0000)

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

Mon, 30 Dec 2013 20:55:24 +0000 (20:55 +0000)
author Eino-Ville Talvala <etalvala@google.com>
Mon, 30 Dec 2013 20:55:23 +0000 (20:55 +0000)
committer Android (Google) Code Review <android-gerrit@google.com>
Mon, 30 Dec 2013 20:55:24 +0000 (20:55 +0000)
diff --cc core/java/android/hardware/camera2/CaptureRequest.java
Simple merge
diff --cc core/java/android/hardware/camera2/CaptureResult.java
Simple merge
author	Eino-Ville Talvala <etalvala@google.com>
	Mon, 30 Dec 2013 20:55:23 +0000 (20:55 +0000)
committer	Android (Google) Code Review <android-gerrit@google.com>
	Mon, 30 Dec 2013 20:55:24 +0000 (20:55 +0000)
		1	2
core/java/android/hardware/camera2/CaptureRequest.java	patch \|	diff1 \|	diff2 \|	blob \| history
core/java/android/hardware/camera2/CaptureResult.java	patch \|	diff1 \|	diff2 \|	blob \| history