Merge "Camera2: Allow rendering to arbitrary surface sizes in LEGACY mode." into...

author Ruben Brunk <rubenbrunk@google.com>

Tue, 9 Dec 2014 23:20:39 +0000 (23:20 +0000)

committer android-build-merger <android-build-merger@google.com>

Tue, 9 Dec 2014 23:20:39 +0000 (23:20 +0000)
author Ruben Brunk <rubenbrunk@google.com>
Tue, 9 Dec 2014 23:20:39 +0000 (23:20 +0000)
committer android-build-merger <android-build-merger@google.com>
Tue, 9 Dec 2014 23:20:39 +0000 (23:20 +0000)
diff --cc core/jni/android_hardware_camera2_legacy_LegacyCameraDevice.cpp
Simple merge
diff --cc media/jni/android_media_ImageReader.cpp
Simple merge
author	Ruben Brunk <rubenbrunk@google.com>
	Tue, 9 Dec 2014 23:20:39 +0000 (23:20 +0000)
committer	android-build-merger <android-build-merger@google.com>
	Tue, 9 Dec 2014 23:20:39 +0000 (23:20 +0000)
		1	2
core/jni/android_hardware_camera2_legacy_LegacyCameraDevice.cpp	patch \|	diff1 \|	diff2 \|	blob \| history
media/jni/android_media_ImageReader.cpp	patch \|	diff1 \|	diff2 \|	blob \| history