summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTim Murray <timmurray@google.com>2013-12-17 13:28:17 -0800
committerTim Murray <timmurray@google.com>2013-12-17 13:28:17 -0800
commitd1576fb039f018ea4d55abbb2c03d542011be399 (patch)
treee69fc47ea873621e2106d69e3d08c6d8e5d7fc93
parent0a11eb10ff08ad7a683cfc7c458b6625b955df2c (diff)
downloadframeworks_base-d1576fb039f018ea4d55abbb2c03d542011be399.zip
frameworks_base-d1576fb039f018ea4d55abbb2c03d542011be399.tar.gz
frameworks_base-d1576fb039f018ea4d55abbb2c03d542011be399.tar.bz2
Move RenderScript from graphics/ to new fw/base subdirectory rs.
Change-Id: I30b6633578f063840e1bdbcc9ba513b727912a6d
-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 45dd25a..45dd25a 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 6c1b1ed..6c1b1ed 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 1a15ce6..1a15ce6 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 3ad79e4..3ad79e4 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 a138313..a138313 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 fa4c13d..fa4c13d 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 4c7319d..4c7319d 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 b819716..b819716 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 e4829f7..e4829f7 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 93e839e..93e839e 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 723ab24..723ab24 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 f0acb56..f0acb56 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 e9f8ca7..e9f8ca7 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 555bdf6..555bdf6 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 6541b2e..6541b2e 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 4cd89db..4cd89db 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 120957b..120957b 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 5431b9a..5431b9a 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 1c0e2e2..1c0e2e2 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 fabf204..fabf204 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 8e243cc..8e243cc 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 757b910..757b910 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 048262d..048262d 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 9a4af77..9a4af77 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 5d5bf5f..5d5bf5f 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 a4ecc38..a4ecc38 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 f3502aa..f3502aa 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 3eb9b75..3eb9b75 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 2704130..2704130 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 e1c35c5..e1c35c5 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 8c7c9aa..8c7c9aa 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 730c51b..730c51b 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 d194ba9..d194ba9 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 2d281b8..2d281b8 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 9e6507f..9e6507f 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 5c68594..5c68594 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 c881898..c881898 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 b4b629e..b4b629e 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 5db72d9..5db72d9 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 af3258a..af3258a 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 d2c7456..d2c7456 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 714e835..714e835 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 39b867b..39b867b 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 5ab18f7..5ab18f7 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 c7979f6..c7979f6 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 f1a7273..f1a7273 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 8719e01..8719e01 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 33e64bd..33e64bd 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 40f1a3e..40f1a3e 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 2b36d27..2b36d27 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 4b0d507..4b0d507 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 a1a1b7e..a1a1b7e 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 8b66896..8b66896 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 536663d..536663d 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 001095c..001095c 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 f942982..f942982 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 24809f7..24809f7 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 661db0a..661db0a 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 a2d74f2..a2d74f2 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 83bf4a5..83bf4a5 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 eb178c1..eb178c1 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 cbb5b3b..cbb5b3b 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 619e737..619e737 100644
--- a/graphics/jni/android_renderscript_RenderScript.cpp
+++ b/rs/jni/android_renderscript_RenderScript.cpp