summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--rs/java/android/renderscript/Allocation.java (renamed from graphics/java/android/renderscript/Allocation.java)0
-rw-r--r--rs/java/android/renderscript/AllocationAdapter.java (renamed from graphics/java/android/renderscript/AllocationAdapter.java)0
-rw-r--r--rs/java/android/renderscript/BaseObj.java (renamed from graphics/java/android/renderscript/BaseObj.java)0
-rw-r--r--rs/java/android/renderscript/Byte2.java (renamed from graphics/java/android/renderscript/Byte2.java)0
-rw-r--r--rs/java/android/renderscript/Byte3.java (renamed from graphics/java/android/renderscript/Byte3.java)0
-rw-r--r--rs/java/android/renderscript/Byte4.java (renamed from graphics/java/android/renderscript/Byte4.java)0
-rw-r--r--rs/java/android/renderscript/Double2.java (renamed from graphics/java/android/renderscript/Double2.java)0
-rw-r--r--rs/java/android/renderscript/Double3.java (renamed from graphics/java/android/renderscript/Double3.java)0
-rw-r--r--rs/java/android/renderscript/Double4.java (renamed from graphics/java/android/renderscript/Double4.java)0
-rw-r--r--rs/java/android/renderscript/Element.java (renamed from graphics/java/android/renderscript/Element.java)0
-rw-r--r--rs/java/android/renderscript/FieldPacker.java (renamed from graphics/java/android/renderscript/FieldPacker.java)0
-rw-r--r--rs/java/android/renderscript/FileA3D.java (renamed from graphics/java/android/renderscript/FileA3D.java)0
-rw-r--r--rs/java/android/renderscript/Float2.java (renamed from graphics/java/android/renderscript/Float2.java)0
-rw-r--r--rs/java/android/renderscript/Float3.java (renamed from graphics/java/android/renderscript/Float3.java)0
-rw-r--r--rs/java/android/renderscript/Float4.java (renamed from graphics/java/android/renderscript/Float4.java)0
-rw-r--r--rs/java/android/renderscript/Font.java (renamed from graphics/java/android/renderscript/Font.java)0
-rw-r--r--rs/java/android/renderscript/Int2.java (renamed from graphics/java/android/renderscript/Int2.java)0
-rw-r--r--rs/java/android/renderscript/Int3.java (renamed from graphics/java/android/renderscript/Int3.java)0
-rw-r--r--rs/java/android/renderscript/Int4.java (renamed from graphics/java/android/renderscript/Int4.java)0
-rw-r--r--rs/java/android/renderscript/Long2.java (renamed from graphics/java/android/renderscript/Long2.java)0
-rw-r--r--rs/java/android/renderscript/Long3.java (renamed from graphics/java/android/renderscript/Long3.java)0
-rw-r--r--rs/java/android/renderscript/Long4.java (renamed from graphics/java/android/renderscript/Long4.java)0
-rw-r--r--rs/java/android/renderscript/Matrix2f.java (renamed from graphics/java/android/renderscript/Matrix2f.java)0
-rw-r--r--rs/java/android/renderscript/Matrix3f.java (renamed from graphics/java/android/renderscript/Matrix3f.java)0
-rw-r--r--rs/java/android/renderscript/Matrix4f.java (renamed from graphics/java/android/renderscript/Matrix4f.java)0
-rw-r--r--rs/java/android/renderscript/Mesh.java (renamed from graphics/java/android/renderscript/Mesh.java)0
-rw-r--r--rs/java/android/renderscript/Path.java (renamed from graphics/java/android/renderscript/Path.java)0
-rw-r--r--rs/java/android/renderscript/Program.java (renamed from graphics/java/android/renderscript/Program.java)0
-rw-r--r--rs/java/android/renderscript/ProgramFragment.java (renamed from graphics/java/android/renderscript/ProgramFragment.java)0
-rw-r--r--rs/java/android/renderscript/ProgramFragmentFixedFunction.java (renamed from graphics/java/android/renderscript/ProgramFragmentFixedFunction.java)0
-rw-r--r--rs/java/android/renderscript/ProgramRaster.java (renamed from graphics/java/android/renderscript/ProgramRaster.java)0
-rw-r--r--rs/java/android/renderscript/ProgramStore.java (renamed from graphics/java/android/renderscript/ProgramStore.java)0
-rw-r--r--rs/java/android/renderscript/ProgramVertex.java (renamed from graphics/java/android/renderscript/ProgramVertex.java)0
-rw-r--r--rs/java/android/renderscript/ProgramVertexFixedFunction.java (renamed from graphics/java/android/renderscript/ProgramVertexFixedFunction.java)0
-rw-r--r--rs/java/android/renderscript/RSDriverException.java (renamed from graphics/java/android/renderscript/RSDriverException.java)0
-rw-r--r--rs/java/android/renderscript/RSIllegalArgumentException.java (renamed from graphics/java/android/renderscript/RSIllegalArgumentException.java)0
-rw-r--r--rs/java/android/renderscript/RSInvalidStateException.java (renamed from graphics/java/android/renderscript/RSInvalidStateException.java)0
-rw-r--r--rs/java/android/renderscript/RSRuntimeException.java (renamed from graphics/java/android/renderscript/RSRuntimeException.java)0
-rw-r--r--rs/java/android/renderscript/RSSurfaceView.java (renamed from graphics/java/android/renderscript/RSSurfaceView.java)0
-rw-r--r--rs/java/android/renderscript/RSTextureView.java (renamed from graphics/java/android/renderscript/RSTextureView.java)0
-rw-r--r--rs/java/android/renderscript/RenderScript.java (renamed from graphics/java/android/renderscript/RenderScript.java)0
-rw-r--r--rs/java/android/renderscript/RenderScriptGL.java (renamed from graphics/java/android/renderscript/RenderScriptGL.java)0
-rw-r--r--rs/java/android/renderscript/Sampler.java (renamed from graphics/java/android/renderscript/Sampler.java)0
-rw-r--r--rs/java/android/renderscript/Script.java (renamed from graphics/java/android/renderscript/Script.java)0
-rw-r--r--rs/java/android/renderscript/ScriptC.java (renamed from graphics/java/android/renderscript/ScriptC.java)0
-rw-r--r--rs/java/android/renderscript/ScriptGroup.java (renamed from graphics/java/android/renderscript/ScriptGroup.java)0
-rw-r--r--rs/java/android/renderscript/ScriptIntrinsic.java (renamed from graphics/java/android/renderscript/ScriptIntrinsic.java)0
-rw-r--r--rs/java/android/renderscript/ScriptIntrinsic3DLUT.java (renamed from graphics/java/android/renderscript/ScriptIntrinsic3DLUT.java)0
-rw-r--r--rs/java/android/renderscript/ScriptIntrinsicBlend.java (renamed from graphics/java/android/renderscript/ScriptIntrinsicBlend.java)0
-rw-r--r--rs/java/android/renderscript/ScriptIntrinsicBlur.java (renamed from graphics/java/android/renderscript/ScriptIntrinsicBlur.java)0
-rw-r--r--rs/java/android/renderscript/ScriptIntrinsicColorMatrix.java (renamed from graphics/java/android/renderscript/ScriptIntrinsicColorMatrix.java)0
-rw-r--r--rs/java/android/renderscript/ScriptIntrinsicConvolve3x3.java (renamed from graphics/java/android/renderscript/ScriptIntrinsicConvolve3x3.java)0
-rw-r--r--rs/java/android/renderscript/ScriptIntrinsicConvolve5x5.java (renamed from graphics/java/android/renderscript/ScriptIntrinsicConvolve5x5.java)0
-rw-r--r--rs/java/android/renderscript/ScriptIntrinsicHistogram.java (renamed from graphics/java/android/renderscript/ScriptIntrinsicHistogram.java)0
-rw-r--r--rs/java/android/renderscript/ScriptIntrinsicLUT.java (renamed from graphics/java/android/renderscript/ScriptIntrinsicLUT.java)0
-rw-r--r--rs/java/android/renderscript/ScriptIntrinsicYuvToRGB.java (renamed from graphics/java/android/renderscript/ScriptIntrinsicYuvToRGB.java)0
-rw-r--r--rs/java/android/renderscript/Short2.java (renamed from graphics/java/android/renderscript/Short2.java)0
-rw-r--r--rs/java/android/renderscript/Short3.java (renamed from graphics/java/android/renderscript/Short3.java)0
-rw-r--r--rs/java/android/renderscript/Short4.java (renamed from graphics/java/android/renderscript/Short4.java)0
-rw-r--r--rs/java/android/renderscript/Type.java (renamed from graphics/java/android/renderscript/Type.java)0
-rw-r--r--rs/java/android/renderscript/package.html (renamed from graphics/java/android/renderscript/package.html)0
-rw-r--r--rs/jni/Android.mk (renamed from graphics/jni/Android.mk)0
-rw-r--r--rs/jni/android_renderscript_RenderScript.cpp (renamed from graphics/jni/android_renderscript_RenderScript.cpp)0
63 files changed, 0 insertions, 0 deletions
diff --git a/graphics/java/android/renderscript/Allocation.java b/rs/java/android/renderscript/Allocation.java
index 98fabcee7e39..98fabcee7e39 100644
--- a/graphics/java/android/renderscript/Allocation.java
+++ b/rs/java/android/renderscript/Allocation.java
diff --git a/graphics/java/android/renderscript/AllocationAdapter.java b/rs/java/android/renderscript/AllocationAdapter.java
index b77d087a01aa..b77d087a01aa 100644
--- a/graphics/java/android/renderscript/AllocationAdapter.java
+++ b/rs/java/android/renderscript/AllocationAdapter.java
diff --git a/graphics/java/android/renderscript/BaseObj.java b/rs/java/android/renderscript/BaseObj.java
index 41159b987a2b..41159b987a2b 100644
--- a/graphics/java/android/renderscript/BaseObj.java
+++ b/rs/java/android/renderscript/BaseObj.java
diff --git a/graphics/java/android/renderscript/Byte2.java b/rs/java/android/renderscript/Byte2.java
index f796de3e7551..f796de3e7551 100644
--- a/graphics/java/android/renderscript/Byte2.java
+++ b/rs/java/android/renderscript/Byte2.java
diff --git a/graphics/java/android/renderscript/Byte3.java b/rs/java/android/renderscript/Byte3.java
index f2a95ac5b321..f2a95ac5b321 100644
--- a/graphics/java/android/renderscript/Byte3.java
+++ b/rs/java/android/renderscript/Byte3.java
diff --git a/graphics/java/android/renderscript/Byte4.java b/rs/java/android/renderscript/Byte4.java
index b8a8a6b1ebfa..b8a8a6b1ebfa 100644
--- a/graphics/java/android/renderscript/Byte4.java
+++ b/rs/java/android/renderscript/Byte4.java
diff --git a/graphics/java/android/renderscript/Double2.java b/rs/java/android/renderscript/Double2.java
index 4c7319d5a4b0..4c7319d5a4b0 100644
--- a/graphics/java/android/renderscript/Double2.java
+++ b/rs/java/android/renderscript/Double2.java
diff --git a/graphics/java/android/renderscript/Double3.java b/rs/java/android/renderscript/Double3.java
index b819716017e9..b819716017e9 100644
--- a/graphics/java/android/renderscript/Double3.java
+++ b/rs/java/android/renderscript/Double3.java
diff --git a/graphics/java/android/renderscript/Double4.java b/rs/java/android/renderscript/Double4.java
index e4829f7426ae..e4829f7426ae 100644
--- a/graphics/java/android/renderscript/Double4.java
+++ b/rs/java/android/renderscript/Double4.java
diff --git a/graphics/java/android/renderscript/Element.java b/rs/java/android/renderscript/Element.java
index 293277016908..293277016908 100644
--- a/graphics/java/android/renderscript/Element.java
+++ b/rs/java/android/renderscript/Element.java
diff --git a/graphics/java/android/renderscript/FieldPacker.java b/rs/java/android/renderscript/FieldPacker.java
index cf20e635e22a..cf20e635e22a 100644
--- a/graphics/java/android/renderscript/FieldPacker.java
+++ b/rs/java/android/renderscript/FieldPacker.java
diff --git a/graphics/java/android/renderscript/FileA3D.java b/rs/java/android/renderscript/FileA3D.java
index cdcaff76b0ec..cdcaff76b0ec 100644
--- a/graphics/java/android/renderscript/FileA3D.java
+++ b/rs/java/android/renderscript/FileA3D.java
diff --git a/graphics/java/android/renderscript/Float2.java b/rs/java/android/renderscript/Float2.java
index 26193d2d2f35..26193d2d2f35 100644
--- a/graphics/java/android/renderscript/Float2.java
+++ b/rs/java/android/renderscript/Float2.java
diff --git a/graphics/java/android/renderscript/Float3.java b/rs/java/android/renderscript/Float3.java
index 555bdf6d6e4e..555bdf6d6e4e 100644
--- a/graphics/java/android/renderscript/Float3.java
+++ b/rs/java/android/renderscript/Float3.java
diff --git a/graphics/java/android/renderscript/Float4.java b/rs/java/android/renderscript/Float4.java
index 6541b2ec7264..6541b2ec7264 100644
--- a/graphics/java/android/renderscript/Float4.java
+++ b/rs/java/android/renderscript/Float4.java
diff --git a/graphics/java/android/renderscript/Font.java b/rs/java/android/renderscript/Font.java
index 0375d2b36f9d..0375d2b36f9d 100644
--- a/graphics/java/android/renderscript/Font.java
+++ b/rs/java/android/renderscript/Font.java
diff --git a/graphics/java/android/renderscript/Int2.java b/rs/java/android/renderscript/Int2.java
index 120957bcd726..120957bcd726 100644
--- a/graphics/java/android/renderscript/Int2.java
+++ b/rs/java/android/renderscript/Int2.java
diff --git a/graphics/java/android/renderscript/Int3.java b/rs/java/android/renderscript/Int3.java
index c770395c9617..c770395c9617 100644
--- a/graphics/java/android/renderscript/Int3.java
+++ b/rs/java/android/renderscript/Int3.java
diff --git a/graphics/java/android/renderscript/Int4.java b/rs/java/android/renderscript/Int4.java
index 1c0e2e2621aa..1c0e2e2621aa 100644
--- a/graphics/java/android/renderscript/Int4.java
+++ b/rs/java/android/renderscript/Int4.java
diff --git a/graphics/java/android/renderscript/Long2.java b/rs/java/android/renderscript/Long2.java
index fabf2046a48c..fabf2046a48c 100644
--- a/graphics/java/android/renderscript/Long2.java
+++ b/rs/java/android/renderscript/Long2.java
diff --git a/graphics/java/android/renderscript/Long3.java b/rs/java/android/renderscript/Long3.java
index 88ff855de3a4..88ff855de3a4 100644
--- a/graphics/java/android/renderscript/Long3.java
+++ b/rs/java/android/renderscript/Long3.java
diff --git a/graphics/java/android/renderscript/Long4.java b/rs/java/android/renderscript/Long4.java
index 757b91049596..757b91049596 100644
--- a/graphics/java/android/renderscript/Long4.java
+++ b/rs/java/android/renderscript/Long4.java
diff --git a/graphics/java/android/renderscript/Matrix2f.java b/rs/java/android/renderscript/Matrix2f.java
index d3621fab8d74..d3621fab8d74 100644
--- a/graphics/java/android/renderscript/Matrix2f.java
+++ b/rs/java/android/renderscript/Matrix2f.java
diff --git a/graphics/java/android/renderscript/Matrix3f.java b/rs/java/android/renderscript/Matrix3f.java
index 8c3c330d85ef..8c3c330d85ef 100644
--- a/graphics/java/android/renderscript/Matrix3f.java
+++ b/rs/java/android/renderscript/Matrix3f.java
diff --git a/graphics/java/android/renderscript/Matrix4f.java b/rs/java/android/renderscript/Matrix4f.java
index cd18e3047f55..cd18e3047f55 100644
--- a/graphics/java/android/renderscript/Matrix4f.java
+++ b/rs/java/android/renderscript/Matrix4f.java
diff --git a/graphics/java/android/renderscript/Mesh.java b/rs/java/android/renderscript/Mesh.java
index 9ce3fb256f6f..9ce3fb256f6f 100644
--- a/graphics/java/android/renderscript/Mesh.java
+++ b/rs/java/android/renderscript/Mesh.java
diff --git a/graphics/java/android/renderscript/Path.java b/rs/java/android/renderscript/Path.java
index 5cc67de83622..5cc67de83622 100644
--- a/graphics/java/android/renderscript/Path.java
+++ b/rs/java/android/renderscript/Path.java
diff --git a/graphics/java/android/renderscript/Program.java b/rs/java/android/renderscript/Program.java
index 3eb9b7590f45..3eb9b7590f45 100644
--- a/graphics/java/android/renderscript/Program.java
+++ b/rs/java/android/renderscript/Program.java
diff --git a/graphics/java/android/renderscript/ProgramFragment.java b/rs/java/android/renderscript/ProgramFragment.java
index 5e886a32d77a..5e886a32d77a 100644
--- a/graphics/java/android/renderscript/ProgramFragment.java
+++ b/rs/java/android/renderscript/ProgramFragment.java
diff --git a/graphics/java/android/renderscript/ProgramFragmentFixedFunction.java b/rs/java/android/renderscript/ProgramFragmentFixedFunction.java
index 22aed0a14e95..22aed0a14e95 100644
--- a/graphics/java/android/renderscript/ProgramFragmentFixedFunction.java
+++ b/rs/java/android/renderscript/ProgramFragmentFixedFunction.java
diff --git a/graphics/java/android/renderscript/ProgramRaster.java b/rs/java/android/renderscript/ProgramRaster.java
index e294b05ade7c..e294b05ade7c 100644
--- a/graphics/java/android/renderscript/ProgramRaster.java
+++ b/rs/java/android/renderscript/ProgramRaster.java
diff --git a/graphics/java/android/renderscript/ProgramStore.java b/rs/java/android/renderscript/ProgramStore.java
index dac9e76eb606..dac9e76eb606 100644
--- a/graphics/java/android/renderscript/ProgramStore.java
+++ b/rs/java/android/renderscript/ProgramStore.java
diff --git a/graphics/java/android/renderscript/ProgramVertex.java b/rs/java/android/renderscript/ProgramVertex.java
index b6886e1e7d39..b6886e1e7d39 100644
--- a/graphics/java/android/renderscript/ProgramVertex.java
+++ b/rs/java/android/renderscript/ProgramVertex.java
diff --git a/graphics/java/android/renderscript/ProgramVertexFixedFunction.java b/rs/java/android/renderscript/ProgramVertexFixedFunction.java
index c479c772df41..c479c772df41 100644
--- a/graphics/java/android/renderscript/ProgramVertexFixedFunction.java
+++ b/rs/java/android/renderscript/ProgramVertexFixedFunction.java
diff --git a/graphics/java/android/renderscript/RSDriverException.java b/rs/java/android/renderscript/RSDriverException.java
index 9e6507f517ed..9e6507f517ed 100644
--- a/graphics/java/android/renderscript/RSDriverException.java
+++ b/rs/java/android/renderscript/RSDriverException.java
diff --git a/graphics/java/android/renderscript/RSIllegalArgumentException.java b/rs/java/android/renderscript/RSIllegalArgumentException.java
index 5c68594f33a2..5c68594f33a2 100644
--- a/graphics/java/android/renderscript/RSIllegalArgumentException.java
+++ b/rs/java/android/renderscript/RSIllegalArgumentException.java
diff --git a/graphics/java/android/renderscript/RSInvalidStateException.java b/rs/java/android/renderscript/RSInvalidStateException.java
index c881898dab3d..c881898dab3d 100644
--- a/graphics/java/android/renderscript/RSInvalidStateException.java
+++ b/rs/java/android/renderscript/RSInvalidStateException.java
diff --git a/graphics/java/android/renderscript/RSRuntimeException.java b/rs/java/android/renderscript/RSRuntimeException.java
index b4b629e14184..b4b629e14184 100644
--- a/graphics/java/android/renderscript/RSRuntimeException.java
+++ b/rs/java/android/renderscript/RSRuntimeException.java
diff --git a/graphics/java/android/renderscript/RSSurfaceView.java b/rs/java/android/renderscript/RSSurfaceView.java
index 308d97a3c5ce..308d97a3c5ce 100644
--- a/graphics/java/android/renderscript/RSSurfaceView.java
+++ b/rs/java/android/renderscript/RSSurfaceView.java
diff --git a/graphics/java/android/renderscript/RSTextureView.java b/rs/java/android/renderscript/RSTextureView.java
index 7eeeeae6c352..7eeeeae6c352 100644
--- a/graphics/java/android/renderscript/RSTextureView.java
+++ b/rs/java/android/renderscript/RSTextureView.java
diff --git a/graphics/java/android/renderscript/RenderScript.java b/rs/java/android/renderscript/RenderScript.java
index 147ac15150cc..147ac15150cc 100644
--- a/graphics/java/android/renderscript/RenderScript.java
+++ b/rs/java/android/renderscript/RenderScript.java
diff --git a/graphics/java/android/renderscript/RenderScriptGL.java b/rs/java/android/renderscript/RenderScriptGL.java
index c9cbe3e8bf6e..c9cbe3e8bf6e 100644
--- a/graphics/java/android/renderscript/RenderScriptGL.java
+++ b/rs/java/android/renderscript/RenderScriptGL.java
diff --git a/graphics/java/android/renderscript/Sampler.java b/rs/java/android/renderscript/Sampler.java
index 623055fe7782..623055fe7782 100644
--- a/graphics/java/android/renderscript/Sampler.java
+++ b/rs/java/android/renderscript/Sampler.java
diff --git a/graphics/java/android/renderscript/Script.java b/rs/java/android/renderscript/Script.java
index 5ab18f744c2b..5ab18f744c2b 100644
--- a/graphics/java/android/renderscript/Script.java
+++ b/rs/java/android/renderscript/Script.java
diff --git a/graphics/java/android/renderscript/ScriptC.java b/rs/java/android/renderscript/ScriptC.java
index b0a5759325af..b0a5759325af 100644
--- a/graphics/java/android/renderscript/ScriptC.java
+++ b/rs/java/android/renderscript/ScriptC.java
diff --git a/graphics/java/android/renderscript/ScriptGroup.java b/rs/java/android/renderscript/ScriptGroup.java
index 48dba308af2f..48dba308af2f 100644
--- a/graphics/java/android/renderscript/ScriptGroup.java
+++ b/rs/java/android/renderscript/ScriptGroup.java
diff --git a/graphics/java/android/renderscript/ScriptIntrinsic.java b/rs/java/android/renderscript/ScriptIntrinsic.java
index 8719e0170820..8719e0170820 100644
--- a/graphics/java/android/renderscript/ScriptIntrinsic.java
+++ b/rs/java/android/renderscript/ScriptIntrinsic.java
diff --git a/graphics/java/android/renderscript/ScriptIntrinsic3DLUT.java b/rs/java/android/renderscript/ScriptIntrinsic3DLUT.java
index 96ec875731ff..96ec875731ff 100644
--- a/graphics/java/android/renderscript/ScriptIntrinsic3DLUT.java
+++ b/rs/java/android/renderscript/ScriptIntrinsic3DLUT.java
diff --git a/graphics/java/android/renderscript/ScriptIntrinsicBlend.java b/rs/java/android/renderscript/ScriptIntrinsicBlend.java
index 40f1a3ed2a98..40f1a3ed2a98 100644
--- a/graphics/java/android/renderscript/ScriptIntrinsicBlend.java
+++ b/rs/java/android/renderscript/ScriptIntrinsicBlend.java
diff --git a/graphics/java/android/renderscript/ScriptIntrinsicBlur.java b/rs/java/android/renderscript/ScriptIntrinsicBlur.java
index d1a6fedec6cd..d1a6fedec6cd 100644
--- a/graphics/java/android/renderscript/ScriptIntrinsicBlur.java
+++ b/rs/java/android/renderscript/ScriptIntrinsicBlur.java
diff --git a/graphics/java/android/renderscript/ScriptIntrinsicColorMatrix.java b/rs/java/android/renderscript/ScriptIntrinsicColorMatrix.java
index 601db17f0e6b..601db17f0e6b 100644
--- a/graphics/java/android/renderscript/ScriptIntrinsicColorMatrix.java
+++ b/rs/java/android/renderscript/ScriptIntrinsicColorMatrix.java
diff --git a/graphics/java/android/renderscript/ScriptIntrinsicConvolve3x3.java b/rs/java/android/renderscript/ScriptIntrinsicConvolve3x3.java
index 25f3ee877ae5..25f3ee877ae5 100644
--- a/graphics/java/android/renderscript/ScriptIntrinsicConvolve3x3.java
+++ b/rs/java/android/renderscript/ScriptIntrinsicConvolve3x3.java
diff --git a/graphics/java/android/renderscript/ScriptIntrinsicConvolve5x5.java b/rs/java/android/renderscript/ScriptIntrinsicConvolve5x5.java
index 71ea4cbcc81e..71ea4cbcc81e 100644
--- a/graphics/java/android/renderscript/ScriptIntrinsicConvolve5x5.java
+++ b/rs/java/android/renderscript/ScriptIntrinsicConvolve5x5.java
diff --git a/graphics/java/android/renderscript/ScriptIntrinsicHistogram.java b/rs/java/android/renderscript/ScriptIntrinsicHistogram.java
index 42e4d04e4abc..42e4d04e4abc 100644
--- a/graphics/java/android/renderscript/ScriptIntrinsicHistogram.java
+++ b/rs/java/android/renderscript/ScriptIntrinsicHistogram.java
diff --git a/graphics/java/android/renderscript/ScriptIntrinsicLUT.java b/rs/java/android/renderscript/ScriptIntrinsicLUT.java
index c45c015e82dc..c45c015e82dc 100644
--- a/graphics/java/android/renderscript/ScriptIntrinsicLUT.java
+++ b/rs/java/android/renderscript/ScriptIntrinsicLUT.java
diff --git a/graphics/java/android/renderscript/ScriptIntrinsicYuvToRGB.java b/rs/java/android/renderscript/ScriptIntrinsicYuvToRGB.java
index f942982583bf..f942982583bf 100644
--- a/graphics/java/android/renderscript/ScriptIntrinsicYuvToRGB.java
+++ b/rs/java/android/renderscript/ScriptIntrinsicYuvToRGB.java
diff --git a/graphics/java/android/renderscript/Short2.java b/rs/java/android/renderscript/Short2.java
index 070d608dc181..070d608dc181 100644
--- a/graphics/java/android/renderscript/Short2.java
+++ b/rs/java/android/renderscript/Short2.java
diff --git a/graphics/java/android/renderscript/Short3.java b/rs/java/android/renderscript/Short3.java
index 661db0a89f3d..661db0a89f3d 100644
--- a/graphics/java/android/renderscript/Short3.java
+++ b/rs/java/android/renderscript/Short3.java
diff --git a/graphics/java/android/renderscript/Short4.java b/rs/java/android/renderscript/Short4.java
index a2d74f2ccf94..a2d74f2ccf94 100644
--- a/graphics/java/android/renderscript/Short4.java
+++ b/rs/java/android/renderscript/Short4.java
diff --git a/graphics/java/android/renderscript/Type.java b/rs/java/android/renderscript/Type.java
index 7283814f816f..7283814f816f 100644
--- a/graphics/java/android/renderscript/Type.java
+++ b/rs/java/android/renderscript/Type.java
diff --git a/graphics/java/android/renderscript/package.html b/rs/java/android/renderscript/package.html
index eb178c1ea47e..eb178c1ea47e 100644
--- a/graphics/java/android/renderscript/package.html
+++ b/rs/java/android/renderscript/package.html
diff --git a/graphics/jni/Android.mk b/rs/jni/Android.mk
index cbb5b3b6ba50..cbb5b3b6ba50 100644
--- a/graphics/jni/Android.mk
+++ b/rs/jni/Android.mk
diff --git a/graphics/jni/android_renderscript_RenderScript.cpp b/rs/jni/android_renderscript_RenderScript.cpp
index 7032742d5bd6..7032742d5bd6 100644
--- a/graphics/jni/android_renderscript_RenderScript.cpp
+++ b/rs/jni/android_renderscript_RenderScript.cpp