Merge \\"Delete simple reduction implementation.\\" into nyc-dev am: d749245b88

author David Gross <dgross@google.com>

Mon, 13 Jun 2016 22:20:32 +0000 (22:20 +0000)

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

Mon, 13 Jun 2016 22:20:32 +0000 (22:20 +0000)
author David Gross <dgross@google.com>
Mon, 13 Jun 2016 22:20:32 +0000 (22:20 +0000)
committer android-build-merger <android-build-merger@google.com>
Mon, 13 Jun 2016 22:20:32 +0000 (22:20 +0000)
diff --cc rs/java/android/renderscript/RenderScript.java
Simple merge
diff --cc rs/jni/android_renderscript_RenderScript.cpp
Simple merge
author	David Gross <dgross@google.com>
	Mon, 13 Jun 2016 22:20:32 +0000 (22:20 +0000)
committer	android-build-merger <android-build-merger@google.com>
	Mon, 13 Jun 2016 22:20:32 +0000 (22:20 +0000)
		1	2
rs/java/android/renderscript/RenderScript.java	patch \|	diff1 \|	diff2 \|	blob \| history
rs/jni/android_renderscript_RenderScript.cpp	patch \|	diff1 \|	diff2 \|	blob \| history