Merge "camera2: Add support for logical camera"

author Shuzhen Wang <shuzhenwang@google.com>

Mon, 22 Jan 2018 20:30:15 +0000 (20:30 +0000)

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

Mon, 22 Jan 2018 20:30:15 +0000 (20:30 +0000)
author Shuzhen Wang <shuzhenwang@google.com>
Mon, 22 Jan 2018 20:30:15 +0000 (20:30 +0000)
committer Android (Google) Code Review <android-gerrit@google.com>
Mon, 22 Jan 2018 20:30:15 +0000 (20:30 +0000)
diff --cc api/current.txt
Simple merge
diff --cc core/java/android/hardware/camera2/CameraCharacteristics.java
Simple merge
diff --cc core/java/android/hardware/camera2/CameraMetadata.java
Simple merge
author	Shuzhen Wang <shuzhenwang@google.com>
	Mon, 22 Jan 2018 20:30:15 +0000 (20:30 +0000)
committer	Android (Google) Code Review <android-gerrit@google.com>
	Mon, 22 Jan 2018 20:30:15 +0000 (20:30 +0000)
		1	2
api/current.txt	patch \|	diff1 \|	diff2 \|	blob \| history
core/java/android/hardware/camera2/CameraCharacteristics.java	patch \|	diff1 \|	diff2 \|	blob \| history
core/java/android/hardware/camera2/CameraMetadata.java	patch \|	diff1 \|	diff2 \|	blob \| history