Merge "Camera2: Add metadata keys and enum values" into klp-dev

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

Wed, 14 Aug 2013 20:20:43 +0000 (20:20 +0000)

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

Wed, 14 Aug 2013 20:20:43 +0000 (20:20 +0000)
author Eino-Ville Talvala <etalvala@google.com>
Wed, 14 Aug 2013 20:20:43 +0000 (20:20 +0000)
committer Android (Google) Code Review <android-gerrit@google.com>
Wed, 14 Aug 2013 20:20:43 +0000 (20:20 +0000)
diff --cc api/current.txt
Simple merge
diff --cc core/java/android/hardware/camera2/CameraDevice.java
Simple merge
author	Eino-Ville Talvala <etalvala@google.com>
	Wed, 14 Aug 2013 20:20:43 +0000 (20:20 +0000)
committer	Android (Google) Code Review <android-gerrit@google.com>
	Wed, 14 Aug 2013 20:20:43 +0000 (20:20 +0000)
		1	2
api/current.txt	patch \|	diff1 \|	diff2 \|	blob \| history
core/java/android/hardware/camera2/CameraDevice.java	patch \|	diff1 \|	diff2 \|	blob \| history