Deprecate

Change-Id: Idad2c5ad4f8a30f8cc60d88318f2e1809866d309
diff --git a/api/current.txt b/api/current.txt
index 6d8e9a0..c1d23ee 100644
--- a/api/current.txt
+++ b/api/current.txt
@@ -18315,104 +18315,95 @@
 
 package android.renderscript {
 
-  public class Allocation extends android.renderscript.BaseObj {
-    method public void copy1DRangeFrom(int, int, int[]);
-    method public void copy1DRangeFrom(int, int, short[]);
-    method public void copy1DRangeFrom(int, int, byte[]);
-    method public void copy1DRangeFrom(int, int, float[]);
-    method public void copy1DRangeFrom(int, int, android.renderscript.Allocation, int);
-    method public void copy1DRangeFromUnchecked(int, int, int[]);
-    method public void copy1DRangeFromUnchecked(int, int, short[]);
-    method public void copy1DRangeFromUnchecked(int, int, byte[]);
-    method public void copy1DRangeFromUnchecked(int, int, float[]);
-    method public void copy2DRangeFrom(int, int, int, int, byte[]);
-    method public void copy2DRangeFrom(int, int, int, int, short[]);
-    method public void copy2DRangeFrom(int, int, int, int, int[]);
-    method public void copy2DRangeFrom(int, int, int, int, float[]);
-    method public void copy2DRangeFrom(int, int, int, int, android.renderscript.Allocation, int, int);
-    method public void copy2DRangeFrom(int, int, android.graphics.Bitmap);
-    method public void copyFrom(android.renderscript.BaseObj[]);
-    method public void copyFrom(int[]);
-    method public void copyFrom(short[]);
-    method public void copyFrom(byte[]);
-    method public void copyFrom(float[]);
-    method public void copyFrom(android.graphics.Bitmap);
-    method public void copyFromUnchecked(int[]);
-    method public void copyFromUnchecked(short[]);
-    method public void copyFromUnchecked(byte[]);
-    method public void copyFromUnchecked(float[]);
-    method public void copyTo(android.graphics.Bitmap);
-    method public void copyTo(byte[]);
-    method public void copyTo(short[]);
-    method public void copyTo(int[]);
-    method public void copyTo(float[]);
-    method public static android.renderscript.Allocation createCubemapFromBitmap(android.renderscript.RenderScript, android.graphics.Bitmap, android.renderscript.Allocation.MipmapControl, int);
-    method public static android.renderscript.Allocation createCubemapFromBitmap(android.renderscript.RenderScript, android.graphics.Bitmap);
-    method public static android.renderscript.Allocation createCubemapFromCubeFaces(android.renderscript.RenderScript, android.graphics.Bitmap, android.graphics.Bitmap, android.graphics.Bitmap, android.graphics.Bitmap, android.graphics.Bitmap, android.graphics.Bitmap, android.renderscript.Allocation.MipmapControl, int);
-    method public static android.renderscript.Allocation createCubemapFromCubeFaces(android.renderscript.RenderScript, android.graphics.Bitmap, android.graphics.Bitmap, android.graphics.Bitmap, android.graphics.Bitmap, android.graphics.Bitmap, android.graphics.Bitmap);
-    method public static android.renderscript.Allocation createFromBitmap(android.renderscript.RenderScript, android.graphics.Bitmap, android.renderscript.Allocation.MipmapControl, int);
-    method public static android.renderscript.Allocation createFromBitmap(android.renderscript.RenderScript, android.graphics.Bitmap);
-    method public static android.renderscript.Allocation createFromBitmapResource(android.renderscript.RenderScript, android.content.res.Resources, int, android.renderscript.Allocation.MipmapControl, int);
-    method public static android.renderscript.Allocation createFromBitmapResource(android.renderscript.RenderScript, android.content.res.Resources, int);
-    method public static android.renderscript.Allocation createFromString(android.renderscript.RenderScript, java.lang.String, int);
-    method public static android.renderscript.Allocation createSized(android.renderscript.RenderScript, android.renderscript.Element, int, int);
-    method public static android.renderscript.Allocation createSized(android.renderscript.RenderScript, android.renderscript.Element, int);
-    method public static android.renderscript.Allocation createTyped(android.renderscript.RenderScript, android.renderscript.Type, android.renderscript.Allocation.MipmapControl, int);
-    method public static android.renderscript.Allocation createTyped(android.renderscript.RenderScript, android.renderscript.Type, int);
-    method public static android.renderscript.Allocation createTyped(android.renderscript.RenderScript, android.renderscript.Type);
-    method public void generateMipmaps();
-    method public int getBytesSize();
-    method public android.renderscript.Element getElement();
-    method public android.view.Surface getSurface();
-    method public android.renderscript.Type getType();
-    method public int getUsage();
-    method public void ioReceive();
-    method public void ioSend();
-    method public synchronized void resize(int);
-    method public void setFromFieldPacker(int, android.renderscript.FieldPacker);
-    method public void setFromFieldPacker(int, int, android.renderscript.FieldPacker);
-    method public void setSurface(android.view.Surface);
-    method public void syncAll(int);
-    field public static final int USAGE_GRAPHICS_CONSTANTS = 8; // 0x8
-    field public static final int USAGE_GRAPHICS_RENDER_TARGET = 16; // 0x10
-    field public static final int USAGE_GRAPHICS_TEXTURE = 2; // 0x2
-    field public static final int USAGE_GRAPHICS_VERTEX = 4; // 0x4
-    field public static final int USAGE_IO_INPUT = 32; // 0x20
-    field public static final int USAGE_IO_OUTPUT = 64; // 0x40
-    field public static final int USAGE_SCRIPT = 1; // 0x1
+  public deprecated class Allocation extends android.renderscript.BaseObj {
+    method public deprecated void copy1DRangeFrom(int, int, int[]);
+    method public deprecated void copy1DRangeFrom(int, int, short[]);
+    method public deprecated void copy1DRangeFrom(int, int, byte[]);
+    method public deprecated void copy1DRangeFrom(int, int, float[]);
+    method public deprecated void copy1DRangeFrom(int, int, android.renderscript.Allocation, int);
+    method public deprecated void copy1DRangeFromUnchecked(int, int, int[]);
+    method public deprecated void copy1DRangeFromUnchecked(int, int, short[]);
+    method public deprecated void copy1DRangeFromUnchecked(int, int, byte[]);
+    method public deprecated void copy1DRangeFromUnchecked(int, int, float[]);
+    method public deprecated void copy2DRangeFrom(int, int, int, int, byte[]);
+    method public deprecated void copy2DRangeFrom(int, int, int, int, short[]);
+    method public deprecated void copy2DRangeFrom(int, int, int, int, int[]);
+    method public deprecated void copy2DRangeFrom(int, int, int, int, float[]);
+    method public deprecated void copy2DRangeFrom(int, int, int, int, android.renderscript.Allocation, int, int);
+    method public deprecated void copy2DRangeFrom(int, int, android.graphics.Bitmap);
+    method public deprecated void copyFrom(android.renderscript.BaseObj[]);
+    method public deprecated void copyFrom(int[]);
+    method public deprecated void copyFrom(short[]);
+    method public deprecated void copyFrom(byte[]);
+    method public deprecated void copyFrom(float[]);
+    method public deprecated void copyFrom(android.graphics.Bitmap);
+    method public deprecated void copyFromUnchecked(int[]);
+    method public deprecated void copyFromUnchecked(short[]);
+    method public deprecated void copyFromUnchecked(byte[]);
+    method public deprecated void copyFromUnchecked(float[]);
+    method public deprecated void copyTo(android.graphics.Bitmap);
+    method public deprecated void copyTo(byte[]);
+    method public deprecated void copyTo(short[]);
+    method public deprecated void copyTo(int[]);
+    method public deprecated void copyTo(float[]);
+    method public static deprecated android.renderscript.Allocation createCubemapFromBitmap(android.renderscript.RenderScript, android.graphics.Bitmap, android.renderscript.Allocation.MipmapControl, int);
+    method public static deprecated android.renderscript.Allocation createCubemapFromBitmap(android.renderscript.RenderScript, android.graphics.Bitmap);
+    method public static deprecated android.renderscript.Allocation createCubemapFromCubeFaces(android.renderscript.RenderScript, android.graphics.Bitmap, android.graphics.Bitmap, android.graphics.Bitmap, android.graphics.Bitmap, android.graphics.Bitmap, android.graphics.Bitmap, android.renderscript.Allocation.MipmapControl, int);
+    method public static deprecated android.renderscript.Allocation createCubemapFromCubeFaces(android.renderscript.RenderScript, android.graphics.Bitmap, android.graphics.Bitmap, android.graphics.Bitmap, android.graphics.Bitmap, android.graphics.Bitmap, android.graphics.Bitmap);
+    method public static deprecated android.renderscript.Allocation createFromBitmap(android.renderscript.RenderScript, android.graphics.Bitmap, android.renderscript.Allocation.MipmapControl, int);
+    method public static deprecated android.renderscript.Allocation createFromBitmap(android.renderscript.RenderScript, android.graphics.Bitmap);
+    method public static deprecated android.renderscript.Allocation createFromBitmapResource(android.renderscript.RenderScript, android.content.res.Resources, int, android.renderscript.Allocation.MipmapControl, int);
+    method public static deprecated android.renderscript.Allocation createFromBitmapResource(android.renderscript.RenderScript, android.content.res.Resources, int);
+    method public static deprecated android.renderscript.Allocation createFromString(android.renderscript.RenderScript, java.lang.String, int);
+    method public static deprecated android.renderscript.Allocation createSized(android.renderscript.RenderScript, android.renderscript.Element, int, int);
+    method public static deprecated android.renderscript.Allocation createSized(android.renderscript.RenderScript, android.renderscript.Element, int);
+    method public static deprecated android.renderscript.Allocation createTyped(android.renderscript.RenderScript, android.renderscript.Type, android.renderscript.Allocation.MipmapControl, int);
+    method public static deprecated android.renderscript.Allocation createTyped(android.renderscript.RenderScript, android.renderscript.Type, int);
+    method public static deprecated android.renderscript.Allocation createTyped(android.renderscript.RenderScript, android.renderscript.Type);
+    method public deprecated void generateMipmaps();
+    method public deprecated android.renderscript.Type getType();
+    method public deprecated synchronized void resize(int);
+    method public deprecated void setFromFieldPacker(int, android.renderscript.FieldPacker);
+    method public deprecated void setFromFieldPacker(int, int, android.renderscript.FieldPacker);
+    method public deprecated void syncAll(int);
+    field public static final deprecated int USAGE_GRAPHICS_CONSTANTS = 8; // 0x8
+    field public static final deprecated int USAGE_GRAPHICS_RENDER_TARGET = 16; // 0x10
+    field public static final deprecated int USAGE_GRAPHICS_TEXTURE = 2; // 0x2
+    field public static final deprecated int USAGE_GRAPHICS_VERTEX = 4; // 0x4
+    field public static final deprecated int USAGE_SCRIPT = 1; // 0x1
   }
 
-  public static final class Allocation.MipmapControl extends java.lang.Enum {
+  public static final deprecated class Allocation.MipmapControl extends java.lang.Enum {
     method public static android.renderscript.Allocation.MipmapControl valueOf(java.lang.String);
     method public static final android.renderscript.Allocation.MipmapControl[] values();
-    enum_constant public static final android.renderscript.Allocation.MipmapControl MIPMAP_FULL;
-    enum_constant public static final android.renderscript.Allocation.MipmapControl MIPMAP_NONE;
-    enum_constant public static final android.renderscript.Allocation.MipmapControl MIPMAP_ON_SYNC_TO_TEXTURE;
+    enum_constant public static final deprecated android.renderscript.Allocation.MipmapControl MIPMAP_FULL;
+    enum_constant public static final deprecated android.renderscript.Allocation.MipmapControl MIPMAP_NONE;
+    enum_constant public static final deprecated android.renderscript.Allocation.MipmapControl MIPMAP_ON_SYNC_TO_TEXTURE;
   }
 
-  public class AllocationAdapter extends android.renderscript.Allocation {
-    method public static android.renderscript.AllocationAdapter create1D(android.renderscript.RenderScript, android.renderscript.Allocation);
-    method public static android.renderscript.AllocationAdapter create2D(android.renderscript.RenderScript, android.renderscript.Allocation);
-    method public void setFace(android.renderscript.Type.CubemapFace);
-    method public void setLOD(int);
-    method public void setY(int);
-    method public void setZ(int);
+  public deprecated class AllocationAdapter extends android.renderscript.Allocation {
+    method public static deprecated android.renderscript.AllocationAdapter create1D(android.renderscript.RenderScript, android.renderscript.Allocation);
+    method public static deprecated android.renderscript.AllocationAdapter create2D(android.renderscript.RenderScript, android.renderscript.Allocation);
+    method public deprecated void setFace(android.renderscript.Type.CubemapFace);
+    method public deprecated void setLOD(int);
+    method public deprecated void setY(int);
+    method public deprecated void setZ(int);
   }
 
-  public class BaseObj {
-    method public synchronized void destroy();
-    method public java.lang.String getName();
-    method public void setName(java.lang.String);
+  public deprecated class BaseObj {
+    method public deprecated synchronized void destroy();
+    method public deprecated java.lang.String getName();
+    method public deprecated void setName(java.lang.String);
   }
 
-  public class Byte2 {
+  public deprecated class Byte2 {
     ctor public Byte2();
     ctor public Byte2(byte, byte);
     field public byte x;
     field public byte y;
   }
 
-  public class Byte3 {
+  public deprecated class Byte3 {
     ctor public Byte3();
     ctor public Byte3(byte, byte, byte);
     field public byte x;
@@ -18420,7 +18411,7 @@
     field public byte z;
   }
 
-  public class Byte4 {
+  public deprecated class Byte4 {
     ctor public Byte4();
     ctor public Byte4(byte, byte, byte, byte);
     field public byte w;
@@ -18429,14 +18420,14 @@
     field public byte z;
   }
 
-  public class Double2 {
+  public deprecated class Double2 {
     ctor public Double2();
     ctor public Double2(double, double);
     field public double x;
     field public double y;
   }
 
-  public class Double3 {
+  public deprecated class Double3 {
     ctor public Double3();
     ctor public Double3(double, double, double);
     field public double x;
@@ -18444,7 +18435,7 @@
     field public double z;
   }
 
-  public class Double4 {
+  public deprecated class Double4 {
     ctor public Double4();
     ctor public Double4(double, double, double, double);
     field public double w;
@@ -18453,92 +18444,82 @@
     field public double z;
   }
 
-  public class Element extends android.renderscript.BaseObj {
-    method public static android.renderscript.Element ALLOCATION(android.renderscript.RenderScript);
-    method public static android.renderscript.Element A_8(android.renderscript.RenderScript);
-    method public static android.renderscript.Element BOOLEAN(android.renderscript.RenderScript);
-    method public static android.renderscript.Element ELEMENT(android.renderscript.RenderScript);
-    method public static android.renderscript.Element F32(android.renderscript.RenderScript);
-    method public static android.renderscript.Element F32_2(android.renderscript.RenderScript);
-    method public static android.renderscript.Element F32_3(android.renderscript.RenderScript);
-    method public static android.renderscript.Element F32_4(android.renderscript.RenderScript);
-    method public static android.renderscript.Element F64(android.renderscript.RenderScript);
-    method public static android.renderscript.Element F64_2(android.renderscript.RenderScript);
-    method public static android.renderscript.Element F64_3(android.renderscript.RenderScript);
-    method public static android.renderscript.Element F64_4(android.renderscript.RenderScript);
-    method public static android.renderscript.Element FONT(android.renderscript.RenderScript);
-    method public static android.renderscript.Element I16(android.renderscript.RenderScript);
-    method public static android.renderscript.Element I16_2(android.renderscript.RenderScript);
-    method public static android.renderscript.Element I16_3(android.renderscript.RenderScript);
-    method public static android.renderscript.Element I16_4(android.renderscript.RenderScript);
-    method public static android.renderscript.Element I32(android.renderscript.RenderScript);
-    method public static android.renderscript.Element I32_2(android.renderscript.RenderScript);
-    method public static android.renderscript.Element I32_3(android.renderscript.RenderScript);
-    method public static android.renderscript.Element I32_4(android.renderscript.RenderScript);
-    method public static android.renderscript.Element I64(android.renderscript.RenderScript);
-    method public static android.renderscript.Element I64_2(android.renderscript.RenderScript);
-    method public static android.renderscript.Element I64_3(android.renderscript.RenderScript);
-    method public static android.renderscript.Element I64_4(android.renderscript.RenderScript);
-    method public static android.renderscript.Element I8(android.renderscript.RenderScript);
-    method public static android.renderscript.Element I8_2(android.renderscript.RenderScript);
-    method public static android.renderscript.Element I8_3(android.renderscript.RenderScript);
-    method public static android.renderscript.Element I8_4(android.renderscript.RenderScript);
-    method public static android.renderscript.Element MATRIX4X4(android.renderscript.RenderScript);
-    method public static android.renderscript.Element MATRIX_2X2(android.renderscript.RenderScript);
-    method public static android.renderscript.Element MATRIX_3X3(android.renderscript.RenderScript);
-    method public static android.renderscript.Element MATRIX_4X4(android.renderscript.RenderScript);
-    method public static android.renderscript.Element MESH(android.renderscript.RenderScript);
-    method public static android.renderscript.Element PROGRAM_FRAGMENT(android.renderscript.RenderScript);
-    method public static android.renderscript.Element PROGRAM_RASTER(android.renderscript.RenderScript);
-    method public static android.renderscript.Element PROGRAM_STORE(android.renderscript.RenderScript);
-    method public static android.renderscript.Element PROGRAM_VERTEX(android.renderscript.RenderScript);
-    method public static android.renderscript.Element RGBA_4444(android.renderscript.RenderScript);
-    method public static android.renderscript.Element RGBA_5551(android.renderscript.RenderScript);
-    method public static android.renderscript.Element RGBA_8888(android.renderscript.RenderScript);
-    method public static android.renderscript.Element RGB_565(android.renderscript.RenderScript);
-    method public static android.renderscript.Element RGB_888(android.renderscript.RenderScript);
-    method public static android.renderscript.Element SAMPLER(android.renderscript.RenderScript);
-    method public static android.renderscript.Element SCRIPT(android.renderscript.RenderScript);
-    method public static android.renderscript.Element TYPE(android.renderscript.RenderScript);
-    method public static android.renderscript.Element U16(android.renderscript.RenderScript);
-    method public static android.renderscript.Element U16_2(android.renderscript.RenderScript);
-    method public static android.renderscript.Element U16_3(android.renderscript.RenderScript);
-    method public static android.renderscript.Element U16_4(android.renderscript.RenderScript);
-    method public static android.renderscript.Element U32(android.renderscript.RenderScript);
-    method public static android.renderscript.Element U32_2(android.renderscript.RenderScript);
-    method public static android.renderscript.Element U32_3(android.renderscript.RenderScript);
-    method public static android.renderscript.Element U32_4(android.renderscript.RenderScript);
-    method public static android.renderscript.Element U64(android.renderscript.RenderScript);
-    method public static android.renderscript.Element U64_2(android.renderscript.RenderScript);
-    method public static android.renderscript.Element U64_3(android.renderscript.RenderScript);
-    method public static android.renderscript.Element U64_4(android.renderscript.RenderScript);
-    method public static android.renderscript.Element U8(android.renderscript.RenderScript);
-    method public static android.renderscript.Element U8_2(android.renderscript.RenderScript);
-    method public static android.renderscript.Element U8_3(android.renderscript.RenderScript);
-    method public static android.renderscript.Element U8_4(android.renderscript.RenderScript);
-    method public static android.renderscript.Element createPixel(android.renderscript.RenderScript, android.renderscript.Element.DataType, android.renderscript.Element.DataKind);
-    method public static android.renderscript.Element createVector(android.renderscript.RenderScript, android.renderscript.Element.DataType, int);
-    method public int getBytesSize();
-    method public android.renderscript.Element.DataKind getDataKind();
-    method public android.renderscript.Element.DataType getDataType();
-    method public android.renderscript.Element getSubElement(int);
-    method public int getSubElementArraySize(int);
-    method public int getSubElementCount();
-    method public java.lang.String getSubElementName(int);
-    method public int getSubElementOffsetBytes(int);
-    method public int getVectorSize();
-    method public boolean isCompatible(android.renderscript.Element);
-    method public boolean isComplex();
+  public deprecated class Element extends android.renderscript.BaseObj {
+    method public static deprecated android.renderscript.Element ALLOCATION(android.renderscript.RenderScript);
+    method public static deprecated android.renderscript.Element A_8(android.renderscript.RenderScript);
+    method public static deprecated android.renderscript.Element BOOLEAN(android.renderscript.RenderScript);
+    method public static deprecated android.renderscript.Element ELEMENT(android.renderscript.RenderScript);
+    method public static deprecated android.renderscript.Element F32(android.renderscript.RenderScript);
+    method public static deprecated android.renderscript.Element F32_2(android.renderscript.RenderScript);
+    method public static deprecated android.renderscript.Element F32_3(android.renderscript.RenderScript);
+    method public static deprecated android.renderscript.Element F32_4(android.renderscript.RenderScript);
+    method public static deprecated android.renderscript.Element F64(android.renderscript.RenderScript);
+    method public static deprecated android.renderscript.Element F64_2(android.renderscript.RenderScript);
+    method public static deprecated android.renderscript.Element F64_3(android.renderscript.RenderScript);
+    method public static deprecated android.renderscript.Element F64_4(android.renderscript.RenderScript);
+    method public static deprecated android.renderscript.Element I16(android.renderscript.RenderScript);
+    method public static deprecated android.renderscript.Element I16_2(android.renderscript.RenderScript);
+    method public static deprecated android.renderscript.Element I16_3(android.renderscript.RenderScript);
+    method public static deprecated android.renderscript.Element I16_4(android.renderscript.RenderScript);
+    method public static deprecated android.renderscript.Element I32(android.renderscript.RenderScript);
+    method public static deprecated android.renderscript.Element I32_2(android.renderscript.RenderScript);
+    method public static deprecated android.renderscript.Element I32_3(android.renderscript.RenderScript);
+    method public static deprecated android.renderscript.Element I32_4(android.renderscript.RenderScript);
+    method public static deprecated android.renderscript.Element I64(android.renderscript.RenderScript);
+    method public static deprecated android.renderscript.Element I64_2(android.renderscript.RenderScript);
+    method public static deprecated android.renderscript.Element I64_3(android.renderscript.RenderScript);
+    method public static deprecated android.renderscript.Element I64_4(android.renderscript.RenderScript);
+    method public static deprecated android.renderscript.Element I8(android.renderscript.RenderScript);
+    method public static deprecated android.renderscript.Element I8_2(android.renderscript.RenderScript);
+    method public static deprecated android.renderscript.Element I8_3(android.renderscript.RenderScript);
+    method public static deprecated android.renderscript.Element I8_4(android.renderscript.RenderScript);
+    method public static deprecated android.renderscript.Element MATRIX4X4(android.renderscript.RenderScript);
+    method public static deprecated android.renderscript.Element MATRIX_2X2(android.renderscript.RenderScript);
+    method public static deprecated android.renderscript.Element MATRIX_3X3(android.renderscript.RenderScript);
+    method public static deprecated android.renderscript.Element MATRIX_4X4(android.renderscript.RenderScript);
+    method public static deprecated android.renderscript.Element MESH(android.renderscript.RenderScript);
+    method public static deprecated android.renderscript.Element PROGRAM_FRAGMENT(android.renderscript.RenderScript);
+    method public static deprecated android.renderscript.Element PROGRAM_RASTER(android.renderscript.RenderScript);
+    method public static deprecated android.renderscript.Element PROGRAM_STORE(android.renderscript.RenderScript);
+    method public static deprecated android.renderscript.Element PROGRAM_VERTEX(android.renderscript.RenderScript);
+    method public static deprecated android.renderscript.Element RGBA_4444(android.renderscript.RenderScript);
+    method public static deprecated android.renderscript.Element RGBA_5551(android.renderscript.RenderScript);
+    method public static deprecated android.renderscript.Element RGBA_8888(android.renderscript.RenderScript);
+    method public static deprecated android.renderscript.Element RGB_565(android.renderscript.RenderScript);
+    method public static deprecated android.renderscript.Element RGB_888(android.renderscript.RenderScript);
+    method public static deprecated android.renderscript.Element SAMPLER(android.renderscript.RenderScript);
+    method public static deprecated android.renderscript.Element SCRIPT(android.renderscript.RenderScript);
+    method public static deprecated android.renderscript.Element TYPE(android.renderscript.RenderScript);
+    method public static deprecated android.renderscript.Element U16(android.renderscript.RenderScript);
+    method public static deprecated android.renderscript.Element U16_2(android.renderscript.RenderScript);
+    method public static deprecated android.renderscript.Element U16_3(android.renderscript.RenderScript);
+    method public static deprecated android.renderscript.Element U16_4(android.renderscript.RenderScript);
+    method public static deprecated android.renderscript.Element U32(android.renderscript.RenderScript);
+    method public static deprecated android.renderscript.Element U32_2(android.renderscript.RenderScript);
+    method public static deprecated android.renderscript.Element U32_3(android.renderscript.RenderScript);
+    method public static deprecated android.renderscript.Element U32_4(android.renderscript.RenderScript);
+    method public static deprecated android.renderscript.Element U64(android.renderscript.RenderScript);
+    method public static deprecated android.renderscript.Element U64_2(android.renderscript.RenderScript);
+    method public static deprecated android.renderscript.Element U64_3(android.renderscript.RenderScript);
+    method public static deprecated android.renderscript.Element U64_4(android.renderscript.RenderScript);
+    method public static deprecated android.renderscript.Element U8(android.renderscript.RenderScript);
+    method public static deprecated android.renderscript.Element U8_2(android.renderscript.RenderScript);
+    method public static deprecated android.renderscript.Element U8_3(android.renderscript.RenderScript);
+    method public static deprecated android.renderscript.Element U8_4(android.renderscript.RenderScript);
+    method public static deprecated android.renderscript.Element createPixel(android.renderscript.RenderScript, android.renderscript.Element.DataType, android.renderscript.Element.DataKind);
+    method public static deprecated android.renderscript.Element createVector(android.renderscript.RenderScript, android.renderscript.Element.DataType, int);
+    method public deprecated boolean isCompatible(android.renderscript.Element);
+    method public deprecated boolean isComplex();
   }
 
-  public static class Element.Builder {
-    ctor public Element.Builder(android.renderscript.RenderScript);
-    method public android.renderscript.Element.Builder add(android.renderscript.Element, java.lang.String, int);
-    method public android.renderscript.Element.Builder add(android.renderscript.Element, java.lang.String);
-    method public android.renderscript.Element create();
+  public static deprecated class Element.Builder {
+    ctor public deprecated Element.Builder(android.renderscript.RenderScript);
+    method public deprecated android.renderscript.Element.Builder add(android.renderscript.Element, java.lang.String, int);
+    method public deprecated android.renderscript.Element.Builder add(android.renderscript.Element, java.lang.String);
+    method public deprecated android.renderscript.Element create();
   }
 
-  public static final class Element.DataKind extends java.lang.Enum {
+  public static final deprecated class Element.DataKind extends java.lang.Enum {
     method public static android.renderscript.Element.DataKind valueOf(java.lang.String);
     method public static final android.renderscript.Element.DataKind[] values();
     enum_constant public static final android.renderscript.Element.DataKind PIXEL_A;
@@ -18550,7 +18531,7 @@
     enum_constant public static final android.renderscript.Element.DataKind USER;
   }
 
-  public static final class Element.DataType extends java.lang.Enum {
+  public static final deprecated class Element.DataType extends java.lang.Enum {
     method public static android.renderscript.Element.DataType valueOf(java.lang.String);
     method public static final android.renderscript.Element.DataType[] values();
     enum_constant public static final android.renderscript.Element.DataType BOOLEAN;
@@ -18559,10 +18540,8 @@
     enum_constant public static final android.renderscript.Element.DataType MATRIX_2X2;
     enum_constant public static final android.renderscript.Element.DataType MATRIX_3X3;
     enum_constant public static final android.renderscript.Element.DataType MATRIX_4X4;
-    enum_constant public static final android.renderscript.Element.DataType NONE;
     enum_constant public static final android.renderscript.Element.DataType RS_ALLOCATION;
     enum_constant public static final android.renderscript.Element.DataType RS_ELEMENT;
-    enum_constant public static final android.renderscript.Element.DataType RS_FONT;
     enum_constant public static final android.renderscript.Element.DataType RS_MESH;
     enum_constant public static final android.renderscript.Element.DataType RS_PROGRAM_FRAGMENT;
     enum_constant public static final android.renderscript.Element.DataType RS_PROGRAM_RASTER;
@@ -18584,7 +18563,7 @@
     enum_constant public static final android.renderscript.Element.DataType UNSIGNED_8;
   }
 
-  public class FieldPacker {
+  public deprecated class FieldPacker {
     ctor public FieldPacker(int);
     method public void addBoolean(boolean);
     method public void addF32(float);
@@ -18638,37 +18617,37 @@
     method public void skip(int);
   }
 
-  public class FileA3D extends android.renderscript.BaseObj {
-    method public static android.renderscript.FileA3D createFromAsset(android.renderscript.RenderScript, android.content.res.AssetManager, java.lang.String);
-    method public static android.renderscript.FileA3D createFromFile(android.renderscript.RenderScript, java.lang.String);
-    method public static android.renderscript.FileA3D createFromFile(android.renderscript.RenderScript, java.io.File);
-    method public static android.renderscript.FileA3D createFromResource(android.renderscript.RenderScript, android.content.res.Resources, int);
-    method public android.renderscript.FileA3D.IndexEntry getIndexEntry(int);
-    method public int getIndexEntryCount();
+  public deprecated class FileA3D extends android.renderscript.BaseObj {
+    method public static deprecated android.renderscript.FileA3D createFromAsset(android.renderscript.RenderScript, android.content.res.AssetManager, java.lang.String);
+    method public static deprecated android.renderscript.FileA3D createFromFile(android.renderscript.RenderScript, java.lang.String);
+    method public static deprecated android.renderscript.FileA3D createFromFile(android.renderscript.RenderScript, java.io.File);
+    method public static deprecated android.renderscript.FileA3D createFromResource(android.renderscript.RenderScript, android.content.res.Resources, int);
+    method public deprecated android.renderscript.FileA3D.IndexEntry getIndexEntry(int);
+    method public deprecated int getIndexEntryCount();
   }
 
-  public static final class FileA3D.EntryType extends java.lang.Enum {
+  public static final deprecated class FileA3D.EntryType extends java.lang.Enum {
     method public static android.renderscript.FileA3D.EntryType valueOf(java.lang.String);
     method public static final android.renderscript.FileA3D.EntryType[] values();
-    enum_constant public static final android.renderscript.FileA3D.EntryType MESH;
-    enum_constant public static final android.renderscript.FileA3D.EntryType UNKNOWN;
+    enum_constant public static final deprecated android.renderscript.FileA3D.EntryType MESH;
+    enum_constant public static final deprecated android.renderscript.FileA3D.EntryType UNKNOWN;
   }
 
-  public static class FileA3D.IndexEntry {
-    method public android.renderscript.FileA3D.EntryType getEntryType();
-    method public android.renderscript.Mesh getMesh();
-    method public java.lang.String getName();
-    method public android.renderscript.BaseObj getObject();
+  public static deprecated class FileA3D.IndexEntry {
+    method public deprecated android.renderscript.FileA3D.EntryType getEntryType();
+    method public deprecated android.renderscript.Mesh getMesh();
+    method public deprecated java.lang.String getName();
+    method public deprecated android.renderscript.BaseObj getObject();
   }
 
-  public class Float2 {
+  public deprecated class Float2 {
     ctor public Float2();
     ctor public Float2(float, float);
     field public float x;
     field public float y;
   }
 
-  public class Float3 {
+  public deprecated class Float3 {
     ctor public Float3();
     ctor public Float3(float, float, float);
     field public float x;
@@ -18676,7 +18655,7 @@
     field public float z;
   }
 
-  public class Float4 {
+  public deprecated class Float4 {
     ctor public Float4();
     ctor public Float4(float, float, float, float);
     field public float w;
@@ -18685,31 +18664,31 @@
     field public float z;
   }
 
-  public class Font extends android.renderscript.BaseObj {
-    method public static android.renderscript.Font create(android.renderscript.RenderScript, android.content.res.Resources, java.lang.String, android.renderscript.Font.Style, float);
-    method public static android.renderscript.Font createFromAsset(android.renderscript.RenderScript, android.content.res.Resources, java.lang.String, float);
-    method public static android.renderscript.Font createFromFile(android.renderscript.RenderScript, android.content.res.Resources, java.lang.String, float);
-    method public static android.renderscript.Font createFromFile(android.renderscript.RenderScript, android.content.res.Resources, java.io.File, float);
-    method public static android.renderscript.Font createFromResource(android.renderscript.RenderScript, android.content.res.Resources, int, float);
+  public deprecated class Font extends android.renderscript.BaseObj {
+    method public static deprecated android.renderscript.Font create(android.renderscript.RenderScript, android.content.res.Resources, java.lang.String, android.renderscript.Font.Style, float);
+    method public static deprecated android.renderscript.Font createFromAsset(android.renderscript.RenderScript, android.content.res.Resources, java.lang.String, float);
+    method public static deprecated android.renderscript.Font createFromFile(android.renderscript.RenderScript, android.content.res.Resources, java.lang.String, float);
+    method public static deprecated android.renderscript.Font createFromFile(android.renderscript.RenderScript, android.content.res.Resources, java.io.File, float);
+    method public static deprecated android.renderscript.Font createFromResource(android.renderscript.RenderScript, android.content.res.Resources, int, float);
   }
 
-  public static final class Font.Style extends java.lang.Enum {
+  public static final deprecated class Font.Style extends java.lang.Enum {
     method public static android.renderscript.Font.Style valueOf(java.lang.String);
     method public static final android.renderscript.Font.Style[] values();
-    enum_constant public static final android.renderscript.Font.Style BOLD;
-    enum_constant public static final android.renderscript.Font.Style BOLD_ITALIC;
-    enum_constant public static final android.renderscript.Font.Style ITALIC;
-    enum_constant public static final android.renderscript.Font.Style NORMAL;
+    enum_constant public static final deprecated android.renderscript.Font.Style BOLD;
+    enum_constant public static final deprecated android.renderscript.Font.Style BOLD_ITALIC;
+    enum_constant public static final deprecated android.renderscript.Font.Style ITALIC;
+    enum_constant public static final deprecated android.renderscript.Font.Style NORMAL;
   }
 
-  public class Int2 {
+  public deprecated class Int2 {
     ctor public Int2();
     ctor public Int2(int, int);
     field public int x;
     field public int y;
   }
 
-  public class Int3 {
+  public deprecated class Int3 {
     ctor public Int3();
     ctor public Int3(int, int, int);
     field public int x;
@@ -18717,7 +18696,7 @@
     field public int z;
   }
 
-  public class Int4 {
+  public deprecated class Int4 {
     ctor public Int4();
     ctor public Int4(int, int, int, int);
     field public int w;
@@ -18726,14 +18705,14 @@
     field public int z;
   }
 
-  public class Long2 {
+  public deprecated class Long2 {
     ctor public Long2();
     ctor public Long2(long, long);
     field public long x;
     field public long y;
   }
 
-  public class Long3 {
+  public deprecated class Long3 {
     ctor public Long3();
     ctor public Long3(long, long, long);
     field public long x;
@@ -18741,7 +18720,7 @@
     field public long z;
   }
 
-  public class Long4 {
+  public deprecated class Long4 {
     ctor public Long4();
     ctor public Long4(long, long, long, long);
     field public long w;
@@ -18750,384 +18729,365 @@
     field public long z;
   }
 
-  public class Matrix2f {
-    ctor public Matrix2f();
-    ctor public Matrix2f(float[]);
-    method public float get(int, int);
-    method public float[] getArray();
-    method public void load(android.renderscript.Matrix2f);
-    method public void loadIdentity();
-    method public void loadMultiply(android.renderscript.Matrix2f, android.renderscript.Matrix2f);
-    method public void loadRotate(float);
-    method public void loadScale(float, float);
-    method public void multiply(android.renderscript.Matrix2f);
-    method public void rotate(float);
-    method public void scale(float, float);
-    method public void set(int, int, float);
-    method public void transpose();
+  public deprecated class Matrix2f {
+    ctor public deprecated Matrix2f();
+    ctor public deprecated Matrix2f(float[]);
+    method public deprecated float get(int, int);
+    method public deprecated float[] getArray();
+    method public deprecated void load(android.renderscript.Matrix2f);
+    method public deprecated void loadIdentity();
+    method public deprecated void loadMultiply(android.renderscript.Matrix2f, android.renderscript.Matrix2f);
+    method public deprecated void loadRotate(float);
+    method public deprecated void loadScale(float, float);
+    method public deprecated void multiply(android.renderscript.Matrix2f);
+    method public deprecated void rotate(float);
+    method public deprecated void scale(float, float);
+    method public deprecated void set(int, int, float);
+    method public deprecated void transpose();
   }
 
-  public class Matrix3f {
-    ctor public Matrix3f();
-    ctor public Matrix3f(float[]);
-    method public float get(int, int);
-    method public float[] getArray();
-    method public void load(android.renderscript.Matrix3f);
-    method public void loadIdentity();
-    method public void loadMultiply(android.renderscript.Matrix3f, android.renderscript.Matrix3f);
-    method public void loadRotate(float, float, float, float);
-    method public void loadRotate(float);
-    method public void loadScale(float, float);
-    method public void loadScale(float, float, float);
-    method public void loadTranslate(float, float);
-    method public void multiply(android.renderscript.Matrix3f);
-    method public void rotate(float, float, float, float);
-    method public void rotate(float);
-    method public void scale(float, float);
-    method public void scale(float, float, float);
-    method public void set(int, int, float);
-    method public void translate(float, float);
-    method public void transpose();
+  public deprecated class Matrix3f {
+    ctor public deprecated Matrix3f();
+    ctor public deprecated Matrix3f(float[]);
+    method public deprecated float get(int, int);
+    method public deprecated float[] getArray();
+    method public deprecated void load(android.renderscript.Matrix3f);
+    method public deprecated void loadIdentity();
+    method public deprecated void loadMultiply(android.renderscript.Matrix3f, android.renderscript.Matrix3f);
+    method public deprecated void loadRotate(float, float, float, float);
+    method public deprecated void loadRotate(float);
+    method public deprecated void loadScale(float, float);
+    method public deprecated void loadScale(float, float, float);
+    method public deprecated void loadTranslate(float, float);
+    method public deprecated void multiply(android.renderscript.Matrix3f);
+    method public deprecated void rotate(float, float, float, float);
+    method public deprecated void rotate(float);
+    method public deprecated void scale(float, float);
+    method public deprecated void scale(float, float, float);
+    method public deprecated void set(int, int, float);
+    method public deprecated void translate(float, float);
+    method public deprecated void transpose();
   }
 
-  public class Matrix4f {
-    ctor public Matrix4f();
-    ctor public Matrix4f(float[]);
-    method public float get(int, int);
-    method public float[] getArray();
-    method public boolean inverse();
-    method public boolean inverseTranspose();
-    method public void load(android.renderscript.Matrix4f);
-    method public void loadFrustum(float, float, float, float, float, float);
-    method public void loadIdentity();
-    method public void loadMultiply(android.renderscript.Matrix4f, android.renderscript.Matrix4f);
-    method public void loadOrtho(float, float, float, float, float, float);
-    method public void loadOrthoWindow(int, int);
-    method public void loadPerspective(float, float, float, float);
-    method public void loadProjectionNormalized(int, int);
-    method public void loadRotate(float, float, float, float);
-    method public void loadScale(float, float, float);
-    method public void loadTranslate(float, float, float);
-    method public void multiply(android.renderscript.Matrix4f);
-    method public void rotate(float, float, float, float);
-    method public void scale(float, float, float);
-    method public void set(int, int, float);
-    method public void translate(float, float, float);
-    method public void transpose();
+  public deprecated class Matrix4f {
+    ctor public deprecated Matrix4f();
+    ctor public deprecated Matrix4f(float[]);
+    method public deprecated float get(int, int);
+    method public deprecated float[] getArray();
+    method public deprecated boolean inverse();
+    method public deprecated boolean inverseTranspose();
+    method public deprecated void load(android.renderscript.Matrix4f);
+    method public deprecated void loadFrustum(float, float, float, float, float, float);
+    method public deprecated void loadIdentity();
+    method public deprecated void loadMultiply(android.renderscript.Matrix4f, android.renderscript.Matrix4f);
+    method public deprecated void loadOrtho(float, float, float, float, float, float);
+    method public deprecated void loadOrthoWindow(int, int);
+    method public deprecated void loadPerspective(float, float, float, float);
+    method public deprecated void loadProjectionNormalized(int, int);
+    method public deprecated void loadRotate(float, float, float, float);
+    method public deprecated void loadScale(float, float, float);
+    method public deprecated void loadTranslate(float, float, float);
+    method public deprecated void multiply(android.renderscript.Matrix4f);
+    method public deprecated void rotate(float, float, float, float);
+    method public deprecated void scale(float, float, float);
+    method public deprecated void set(int, int, float);
+    method public deprecated void translate(float, float, float);
+    method public deprecated void transpose();
   }
 
-  public class Mesh extends android.renderscript.BaseObj {
-    method public android.renderscript.Allocation getIndexSetAllocation(int);
-    method public android.renderscript.Mesh.Primitive getPrimitive(int);
-    method public int getPrimitiveCount();
-    method public android.renderscript.Allocation getVertexAllocation(int);
-    method public int getVertexAllocationCount();
+  public deprecated class Mesh extends android.renderscript.BaseObj {
+    method public deprecated android.renderscript.Allocation getIndexSetAllocation(int);
+    method public deprecated android.renderscript.Mesh.Primitive getPrimitive(int);
+    method public deprecated int getPrimitiveCount();
+    method public deprecated android.renderscript.Allocation getVertexAllocation(int);
+    method public deprecated int getVertexAllocationCount();
   }
 
-  public static class Mesh.AllocationBuilder {
-    ctor public Mesh.AllocationBuilder(android.renderscript.RenderScript);
-    method public android.renderscript.Mesh.AllocationBuilder addIndexSetAllocation(android.renderscript.Allocation, android.renderscript.Mesh.Primitive);
-    method public android.renderscript.Mesh.AllocationBuilder addIndexSetType(android.renderscript.Mesh.Primitive);
-    method public android.renderscript.Mesh.AllocationBuilder addVertexAllocation(android.renderscript.Allocation) throws java.lang.IllegalStateException;
-    method public android.renderscript.Mesh create();
-    method public int getCurrentIndexSetIndex();
-    method public int getCurrentVertexTypeIndex();
+  public static deprecated class Mesh.AllocationBuilder {
+    ctor public deprecated Mesh.AllocationBuilder(android.renderscript.RenderScript);
+    method public deprecated android.renderscript.Mesh.AllocationBuilder addIndexSetAllocation(android.renderscript.Allocation, android.renderscript.Mesh.Primitive);
+    method public deprecated android.renderscript.Mesh.AllocationBuilder addIndexSetType(android.renderscript.Mesh.Primitive);
+    method public deprecated android.renderscript.Mesh.AllocationBuilder addVertexAllocation(android.renderscript.Allocation) throws java.lang.IllegalStateException;
+    method public deprecated android.renderscript.Mesh create();
+    method public deprecated int getCurrentIndexSetIndex();
+    method public deprecated int getCurrentVertexTypeIndex();
   }
 
-  public static class Mesh.Builder {
-    ctor public Mesh.Builder(android.renderscript.RenderScript, int);
-    method public android.renderscript.Mesh.Builder addIndexSetType(android.renderscript.Type, android.renderscript.Mesh.Primitive);
-    method public android.renderscript.Mesh.Builder addIndexSetType(android.renderscript.Mesh.Primitive);
-    method public android.renderscript.Mesh.Builder addIndexSetType(android.renderscript.Element, int, android.renderscript.Mesh.Primitive);
-    method public android.renderscript.Mesh.Builder addVertexType(android.renderscript.Type) throws java.lang.IllegalStateException;
-    method public android.renderscript.Mesh.Builder addVertexType(android.renderscript.Element, int) throws java.lang.IllegalStateException;
-    method public android.renderscript.Mesh create();
-    method public int getCurrentIndexSetIndex();
-    method public int getCurrentVertexTypeIndex();
+  public static deprecated class Mesh.Builder {
+    ctor public deprecated Mesh.Builder(android.renderscript.RenderScript, int);
+    method public deprecated android.renderscript.Mesh.Builder addIndexSetType(android.renderscript.Type, android.renderscript.Mesh.Primitive);
+    method public deprecated android.renderscript.Mesh.Builder addIndexSetType(android.renderscript.Mesh.Primitive);
+    method public deprecated android.renderscript.Mesh.Builder addIndexSetType(android.renderscript.Element, int, android.renderscript.Mesh.Primitive);
+    method public deprecated android.renderscript.Mesh.Builder addVertexType(android.renderscript.Type) throws java.lang.IllegalStateException;
+    method public deprecated android.renderscript.Mesh.Builder addVertexType(android.renderscript.Element, int) throws java.lang.IllegalStateException;
+    method public deprecated android.renderscript.Mesh create();
+    method public deprecated int getCurrentIndexSetIndex();
+    method public deprecated int getCurrentVertexTypeIndex();
   }
 
-  public static final class Mesh.Primitive extends java.lang.Enum {
+  public static final deprecated class Mesh.Primitive extends java.lang.Enum {
     method public static android.renderscript.Mesh.Primitive valueOf(java.lang.String);
     method public static final android.renderscript.Mesh.Primitive[] values();
-    enum_constant public static final android.renderscript.Mesh.Primitive LINE;
-    enum_constant public static final android.renderscript.Mesh.Primitive LINE_STRIP;
-    enum_constant public static final android.renderscript.Mesh.Primitive POINT;
-    enum_constant public static final android.renderscript.Mesh.Primitive TRIANGLE;
-    enum_constant public static final android.renderscript.Mesh.Primitive TRIANGLE_FAN;
-    enum_constant public static final android.renderscript.Mesh.Primitive TRIANGLE_STRIP;
+    enum_constant public static final deprecated android.renderscript.Mesh.Primitive LINE;
+    enum_constant public static final deprecated android.renderscript.Mesh.Primitive LINE_STRIP;
+    enum_constant public static final deprecated android.renderscript.Mesh.Primitive POINT;
+    enum_constant public static final deprecated android.renderscript.Mesh.Primitive TRIANGLE;
+    enum_constant public static final deprecated android.renderscript.Mesh.Primitive TRIANGLE_FAN;
+    enum_constant public static final deprecated android.renderscript.Mesh.Primitive TRIANGLE_STRIP;
   }
 
-  public static class Mesh.TriangleMeshBuilder {
-    ctor public Mesh.TriangleMeshBuilder(android.renderscript.RenderScript, int, int);
-    method public android.renderscript.Mesh.TriangleMeshBuilder addTriangle(int, int, int);
-    method public android.renderscript.Mesh.TriangleMeshBuilder addVertex(float, float);
-    method public android.renderscript.Mesh.TriangleMeshBuilder addVertex(float, float, float);
-    method public android.renderscript.Mesh create(boolean);
-    method public android.renderscript.Mesh.TriangleMeshBuilder setColor(float, float, float, float);
-    method public android.renderscript.Mesh.TriangleMeshBuilder setNormal(float, float, float);
-    method public android.renderscript.Mesh.TriangleMeshBuilder setTexture(float, float);
-    field public static final int COLOR = 1; // 0x1
-    field public static final int NORMAL = 2; // 0x2
-    field public static final int TEXTURE_0 = 256; // 0x100
+  public static deprecated class Mesh.TriangleMeshBuilder {
+    ctor public deprecated Mesh.TriangleMeshBuilder(android.renderscript.RenderScript, int, int);
+    method public deprecated android.renderscript.Mesh.TriangleMeshBuilder addTriangle(int, int, int);
+    method public deprecated android.renderscript.Mesh.TriangleMeshBuilder addVertex(float, float);
+    method public deprecated android.renderscript.Mesh.TriangleMeshBuilder addVertex(float, float, float);
+    method public deprecated android.renderscript.Mesh create(boolean);
+    method public deprecated android.renderscript.Mesh.TriangleMeshBuilder setColor(float, float, float, float);
+    method public deprecated android.renderscript.Mesh.TriangleMeshBuilder setNormal(float, float, float);
+    method public deprecated android.renderscript.Mesh.TriangleMeshBuilder setTexture(float, float);
+    field public static final deprecated int COLOR = 1; // 0x1
+    field public static final deprecated int NORMAL = 2; // 0x2
+    field public static final deprecated int TEXTURE_0 = 256; // 0x100
   }
 
-  public class Program extends android.renderscript.BaseObj {
-    method public void bindConstants(android.renderscript.Allocation, int);
-    method public void bindSampler(android.renderscript.Sampler, int) throws java.lang.IllegalArgumentException;
-    method public void bindTexture(android.renderscript.Allocation, int) throws java.lang.IllegalArgumentException;
-    method public android.renderscript.Type getConstant(int);
-    method public int getConstantCount();
-    method public int getTextureCount();
-    method public java.lang.String getTextureName(int);
-    method public android.renderscript.Program.TextureType getTextureType(int);
+  public deprecated class Program extends android.renderscript.BaseObj {
+    method public deprecated void bindConstants(android.renderscript.Allocation, int);
+    method public deprecated void bindSampler(android.renderscript.Sampler, int) throws java.lang.IllegalArgumentException;
+    method public deprecated void bindTexture(android.renderscript.Allocation, int) throws java.lang.IllegalArgumentException;
   }
 
   public static class Program.BaseProgramBuilder {
-    ctor protected Program.BaseProgramBuilder(android.renderscript.RenderScript);
-    method public android.renderscript.Program.BaseProgramBuilder addConstant(android.renderscript.Type) throws java.lang.IllegalStateException;
-    method public android.renderscript.Program.BaseProgramBuilder addTexture(android.renderscript.Program.TextureType) throws java.lang.IllegalArgumentException;
-    method public android.renderscript.Program.BaseProgramBuilder addTexture(android.renderscript.Program.TextureType, java.lang.String) throws java.lang.IllegalArgumentException;
-    method public int getCurrentConstantIndex();
-    method public int getCurrentTextureIndex();
-    method protected void initProgram(android.renderscript.Program);
-    method public android.renderscript.Program.BaseProgramBuilder setShader(java.lang.String);
-    method public android.renderscript.Program.BaseProgramBuilder setShader(android.content.res.Resources, int);
+    ctor protected deprecated Program.BaseProgramBuilder(android.renderscript.RenderScript);
+    method public deprecated android.renderscript.Program.BaseProgramBuilder addConstant(android.renderscript.Type) throws java.lang.IllegalStateException;
+    method public deprecated android.renderscript.Program.BaseProgramBuilder addTexture(android.renderscript.Program.TextureType) throws java.lang.IllegalArgumentException;
+    method public deprecated int getCurrentConstantIndex();
+    method public deprecated int getCurrentTextureIndex();
+    method protected deprecated void initProgram(android.renderscript.Program);
+    method public deprecated android.renderscript.Program.BaseProgramBuilder setShader(java.lang.String);
+    method public deprecated android.renderscript.Program.BaseProgramBuilder setShader(android.content.res.Resources, int);
   }
 
-  public static final class Program.TextureType extends java.lang.Enum {
+  public static final deprecated class Program.TextureType extends java.lang.Enum {
     method public static android.renderscript.Program.TextureType valueOf(java.lang.String);
     method public static final android.renderscript.Program.TextureType[] values();
-    enum_constant public static final android.renderscript.Program.TextureType TEXTURE_2D;
-    enum_constant public static final android.renderscript.Program.TextureType TEXTURE_CUBE;
+    enum_constant public static final deprecated android.renderscript.Program.TextureType TEXTURE_2D;
+    enum_constant public static final deprecated android.renderscript.Program.TextureType TEXTURE_CUBE;
   }
 
-  public class ProgramFragment extends android.renderscript.Program {
+  public deprecated class ProgramFragment extends android.renderscript.Program {
   }
 
   public static class ProgramFragment.Builder extends android.renderscript.Program.BaseProgramBuilder {
-    ctor public ProgramFragment.Builder(android.renderscript.RenderScript);
-    method public android.renderscript.ProgramFragment create();
+    ctor public deprecated ProgramFragment.Builder(android.renderscript.RenderScript);
+    method public deprecated android.renderscript.ProgramFragment create();
   }
 
-  public class ProgramFragmentFixedFunction extends android.renderscript.ProgramFragment {
+  public deprecated class ProgramFragmentFixedFunction extends android.renderscript.ProgramFragment {
   }
 
   public static class ProgramFragmentFixedFunction.Builder {
-    ctor public ProgramFragmentFixedFunction.Builder(android.renderscript.RenderScript);
-    method public android.renderscript.ProgramFragmentFixedFunction create();
-    method public android.renderscript.ProgramFragmentFixedFunction.Builder setPointSpriteTexCoordinateReplacement(boolean);
-    method public android.renderscript.ProgramFragmentFixedFunction.Builder setTexture(android.renderscript.ProgramFragmentFixedFunction.Builder.EnvMode, android.renderscript.ProgramFragmentFixedFunction.Builder.Format, int) throws java.lang.IllegalArgumentException;
-    method public android.renderscript.ProgramFragmentFixedFunction.Builder setVaryingColor(boolean);
-    field public static final int MAX_TEXTURE = 2; // 0x2
+    ctor public deprecated ProgramFragmentFixedFunction.Builder(android.renderscript.RenderScript);
+    method public deprecated android.renderscript.ProgramFragmentFixedFunction create();
+    method public deprecated android.renderscript.ProgramFragmentFixedFunction.Builder setPointSpriteTexCoordinateReplacement(boolean);
+    method public deprecated android.renderscript.ProgramFragmentFixedFunction.Builder setTexture(android.renderscript.ProgramFragmentFixedFunction.Builder.EnvMode, android.renderscript.ProgramFragmentFixedFunction.Builder.Format, int) throws java.lang.IllegalArgumentException;
+    method public deprecated android.renderscript.ProgramFragmentFixedFunction.Builder setVaryingColor(boolean);
+    field public static final deprecated int MAX_TEXTURE = 2; // 0x2
   }
 
-  public static final class ProgramFragmentFixedFunction.Builder.EnvMode extends java.lang.Enum {
+  public static final deprecated class ProgramFragmentFixedFunction.Builder.EnvMode extends java.lang.Enum {
     method public static android.renderscript.ProgramFragmentFixedFunction.Builder.EnvMode valueOf(java.lang.String);
     method public static final android.renderscript.ProgramFragmentFixedFunction.Builder.EnvMode[] values();
-    enum_constant public static final android.renderscript.ProgramFragmentFixedFunction.Builder.EnvMode DECAL;
-    enum_constant public static final android.renderscript.ProgramFragmentFixedFunction.Builder.EnvMode MODULATE;
-    enum_constant public static final android.renderscript.ProgramFragmentFixedFunction.Builder.EnvMode REPLACE;
+    enum_constant public static final deprecated android.renderscript.ProgramFragmentFixedFunction.Builder.EnvMode DECAL;
+    enum_constant public static final deprecated android.renderscript.ProgramFragmentFixedFunction.Builder.EnvMode MODULATE;
+    enum_constant public static final deprecated android.renderscript.ProgramFragmentFixedFunction.Builder.EnvMode REPLACE;
   }
 
-  public static final class ProgramFragmentFixedFunction.Builder.Format extends java.lang.Enum {
+  public static final deprecated class ProgramFragmentFixedFunction.Builder.Format extends java.lang.Enum {
     method public static android.renderscript.ProgramFragmentFixedFunction.Builder.Format valueOf(java.lang.String);
     method public static final android.renderscript.ProgramFragmentFixedFunction.Builder.Format[] values();
-    enum_constant public static final android.renderscript.ProgramFragmentFixedFunction.Builder.Format ALPHA;
-    enum_constant public static final android.renderscript.ProgramFragmentFixedFunction.Builder.Format LUMINANCE_ALPHA;
-    enum_constant public static final android.renderscript.ProgramFragmentFixedFunction.Builder.Format RGB;
-    enum_constant public static final android.renderscript.ProgramFragmentFixedFunction.Builder.Format RGBA;
+    enum_constant public static final deprecated android.renderscript.ProgramFragmentFixedFunction.Builder.Format ALPHA;
+    enum_constant public static final deprecated android.renderscript.ProgramFragmentFixedFunction.Builder.Format LUMINANCE_ALPHA;
+    enum_constant public static final deprecated android.renderscript.ProgramFragmentFixedFunction.Builder.Format RGB;
+    enum_constant public static final deprecated android.renderscript.ProgramFragmentFixedFunction.Builder.Format RGBA;
   }
 
-  public class ProgramRaster extends android.renderscript.BaseObj {
-    method public static android.renderscript.ProgramRaster CULL_BACK(android.renderscript.RenderScript);
-    method public static android.renderscript.ProgramRaster CULL_FRONT(android.renderscript.RenderScript);
-    method public static android.renderscript.ProgramRaster CULL_NONE(android.renderscript.RenderScript);
-    method public android.renderscript.ProgramRaster.CullMode getCullMode();
-    method public boolean isPointSpriteEnabled();
+  public deprecated class ProgramRaster extends android.renderscript.BaseObj {
+    method public static deprecated android.renderscript.ProgramRaster CULL_BACK(android.renderscript.RenderScript);
+    method public static deprecated android.renderscript.ProgramRaster CULL_FRONT(android.renderscript.RenderScript);
+    method public static deprecated android.renderscript.ProgramRaster CULL_NONE(android.renderscript.RenderScript);
   }
 
-  public static class ProgramRaster.Builder {
-    ctor public ProgramRaster.Builder(android.renderscript.RenderScript);
-    method public android.renderscript.ProgramRaster create();
-    method public android.renderscript.ProgramRaster.Builder setCullMode(android.renderscript.ProgramRaster.CullMode);
-    method public android.renderscript.ProgramRaster.Builder setPointSpriteEnabled(boolean);
+  public static deprecated class ProgramRaster.Builder {
+    ctor public deprecated ProgramRaster.Builder(android.renderscript.RenderScript);
+    method public deprecated android.renderscript.ProgramRaster create();
+    method public deprecated android.renderscript.ProgramRaster.Builder setCullMode(android.renderscript.ProgramRaster.CullMode);
+    method public deprecated android.renderscript.ProgramRaster.Builder setPointSpriteEnabled(boolean);
   }
 
-  public static final class ProgramRaster.CullMode extends java.lang.Enum {
+  public static final deprecated class ProgramRaster.CullMode extends java.lang.Enum {
     method public static android.renderscript.ProgramRaster.CullMode valueOf(java.lang.String);
     method public static final android.renderscript.ProgramRaster.CullMode[] values();
-    enum_constant public static final android.renderscript.ProgramRaster.CullMode BACK;
-    enum_constant public static final android.renderscript.ProgramRaster.CullMode FRONT;
-    enum_constant public static final android.renderscript.ProgramRaster.CullMode NONE;
+    enum_constant public static final deprecated android.renderscript.ProgramRaster.CullMode BACK;
+    enum_constant public static final deprecated android.renderscript.ProgramRaster.CullMode FRONT;
+    enum_constant public static final deprecated android.renderscript.ProgramRaster.CullMode NONE;
   }
 
-  public class ProgramStore extends android.renderscript.BaseObj {
-    method public static android.renderscript.ProgramStore BLEND_ALPHA_DEPTH_NONE(android.renderscript.RenderScript);
-    method public static android.renderscript.ProgramStore BLEND_ALPHA_DEPTH_TEST(android.renderscript.RenderScript);
-    method public static android.renderscript.ProgramStore BLEND_NONE_DEPTH_NONE(android.renderscript.RenderScript);
-    method public static android.renderscript.ProgramStore BLEND_NONE_DEPTH_TEST(android.renderscript.RenderScript);
-    method public android.renderscript.ProgramStore.BlendDstFunc getBlendDstFunc();
-    method public android.renderscript.ProgramStore.BlendSrcFunc getBlendSrcFunc();
-    method public android.renderscript.ProgramStore.DepthFunc getDepthFunc();
-    method public boolean isColorMaskAlphaEnabled();
-    method public boolean isColorMaskBlueEnabled();
-    method public boolean isColorMaskGreenEnabled();
-    method public boolean isColorMaskRedEnabled();
-    method public boolean isDepthMaskEnabled();
-    method public boolean isDitherEnabled();
+  public deprecated class ProgramStore extends android.renderscript.BaseObj {
+    method public static deprecated android.renderscript.ProgramStore BLEND_ALPHA_DEPTH_NONE(android.renderscript.RenderScript);
+    method public static deprecated android.renderscript.ProgramStore BLEND_ALPHA_DEPTH_TEST(android.renderscript.RenderScript);
+    method public static deprecated android.renderscript.ProgramStore BLEND_NONE_DEPTH_NONE(android.renderscript.RenderScript);
+    method public static deprecated android.renderscript.ProgramStore BLEND_NONE_DEPTH_TEST(android.renderscript.RenderScript);
   }
 
-  public static final class ProgramStore.BlendDstFunc extends java.lang.Enum {
+  public static final deprecated class ProgramStore.BlendDstFunc extends java.lang.Enum {
     method public static android.renderscript.ProgramStore.BlendDstFunc valueOf(java.lang.String);
     method public static final android.renderscript.ProgramStore.BlendDstFunc[] values();
-    enum_constant public static final android.renderscript.ProgramStore.BlendDstFunc DST_ALPHA;
-    enum_constant public static final android.renderscript.ProgramStore.BlendDstFunc ONE;
-    enum_constant public static final android.renderscript.ProgramStore.BlendDstFunc ONE_MINUS_DST_ALPHA;
-    enum_constant public static final android.renderscript.ProgramStore.BlendDstFunc ONE_MINUS_SRC_ALPHA;
-    enum_constant public static final android.renderscript.ProgramStore.BlendDstFunc ONE_MINUS_SRC_COLOR;
-    enum_constant public static final android.renderscript.ProgramStore.BlendDstFunc SRC_ALPHA;
-    enum_constant public static final android.renderscript.ProgramStore.BlendDstFunc SRC_COLOR;
-    enum_constant public static final android.renderscript.ProgramStore.BlendDstFunc ZERO;
+    enum_constant public static final deprecated android.renderscript.ProgramStore.BlendDstFunc DST_ALPHA;
+    enum_constant public static final deprecated android.renderscript.ProgramStore.BlendDstFunc ONE;
+    enum_constant public static final deprecated android.renderscript.ProgramStore.BlendDstFunc ONE_MINUS_DST_ALPHA;
+    enum_constant public static final deprecated android.renderscript.ProgramStore.BlendDstFunc ONE_MINUS_SRC_ALPHA;
+    enum_constant public static final deprecated android.renderscript.ProgramStore.BlendDstFunc ONE_MINUS_SRC_COLOR;
+    enum_constant public static final deprecated android.renderscript.ProgramStore.BlendDstFunc SRC_ALPHA;
+    enum_constant public static final deprecated android.renderscript.ProgramStore.BlendDstFunc SRC_COLOR;
+    enum_constant public static final deprecated android.renderscript.ProgramStore.BlendDstFunc ZERO;
   }
 
-  public static final class ProgramStore.BlendSrcFunc extends java.lang.Enum {
+  public static final deprecated class ProgramStore.BlendSrcFunc extends java.lang.Enum {
     method public static android.renderscript.ProgramStore.BlendSrcFunc valueOf(java.lang.String);
     method public static final android.renderscript.ProgramStore.BlendSrcFunc[] values();
-    enum_constant public static final android.renderscript.ProgramStore.BlendSrcFunc DST_ALPHA;
-    enum_constant public static final android.renderscript.ProgramStore.BlendSrcFunc DST_COLOR;
-    enum_constant public static final android.renderscript.ProgramStore.BlendSrcFunc ONE;
-    enum_constant public static final android.renderscript.ProgramStore.BlendSrcFunc ONE_MINUS_DST_ALPHA;
-    enum_constant public static final android.renderscript.ProgramStore.BlendSrcFunc ONE_MINUS_DST_COLOR;
-    enum_constant public static final android.renderscript.ProgramStore.BlendSrcFunc ONE_MINUS_SRC_ALPHA;
-    enum_constant public static final android.renderscript.ProgramStore.BlendSrcFunc SRC_ALPHA;
-    enum_constant public static final android.renderscript.ProgramStore.BlendSrcFunc SRC_ALPHA_SATURATE;
-    enum_constant public static final android.renderscript.ProgramStore.BlendSrcFunc ZERO;
+    enum_constant public static final deprecated android.renderscript.ProgramStore.BlendSrcFunc DST_ALPHA;
+    enum_constant public static final deprecated android.renderscript.ProgramStore.BlendSrcFunc DST_COLOR;
+    enum_constant public static final deprecated android.renderscript.ProgramStore.BlendSrcFunc ONE;
+    enum_constant public static final deprecated android.renderscript.ProgramStore.BlendSrcFunc ONE_MINUS_DST_ALPHA;
+    enum_constant public static final deprecated android.renderscript.ProgramStore.BlendSrcFunc ONE_MINUS_DST_COLOR;
+    enum_constant public static final deprecated android.renderscript.ProgramStore.BlendSrcFunc ONE_MINUS_SRC_ALPHA;
+    enum_constant public static final deprecated android.renderscript.ProgramStore.BlendSrcFunc SRC_ALPHA;
+    enum_constant public static final deprecated android.renderscript.ProgramStore.BlendSrcFunc SRC_ALPHA_SATURATE;
+    enum_constant public static final deprecated android.renderscript.ProgramStore.BlendSrcFunc ZERO;
   }
 
-  public static class ProgramStore.Builder {
+  public static deprecated class ProgramStore.Builder {
     ctor public ProgramStore.Builder(android.renderscript.RenderScript);
-    method public android.renderscript.ProgramStore create();
-    method public android.renderscript.ProgramStore.Builder setBlendFunc(android.renderscript.ProgramStore.BlendSrcFunc, android.renderscript.ProgramStore.BlendDstFunc);
-    method public android.renderscript.ProgramStore.Builder setColorMaskEnabled(boolean, boolean, boolean, boolean);
-    method public android.renderscript.ProgramStore.Builder setDepthFunc(android.renderscript.ProgramStore.DepthFunc);
-    method public android.renderscript.ProgramStore.Builder setDepthMaskEnabled(boolean);
-    method public android.renderscript.ProgramStore.Builder setDitherEnabled(boolean);
+    method public deprecated android.renderscript.ProgramStore create();
+    method public deprecated android.renderscript.ProgramStore.Builder setBlendFunc(android.renderscript.ProgramStore.BlendSrcFunc, android.renderscript.ProgramStore.BlendDstFunc);
+    method public deprecated android.renderscript.ProgramStore.Builder setColorMaskEnabled(boolean, boolean, boolean, boolean);
+    method public deprecated android.renderscript.ProgramStore.Builder setDepthFunc(android.renderscript.ProgramStore.DepthFunc);
+    method public deprecated android.renderscript.ProgramStore.Builder setDepthMaskEnabled(boolean);
+    method public deprecated android.renderscript.ProgramStore.Builder setDitherEnabled(boolean);
   }
 
-  public static final class ProgramStore.DepthFunc extends java.lang.Enum {
+  public static final deprecated class ProgramStore.DepthFunc extends java.lang.Enum {
     method public static android.renderscript.ProgramStore.DepthFunc valueOf(java.lang.String);
     method public static final android.renderscript.ProgramStore.DepthFunc[] values();
-    enum_constant public static final android.renderscript.ProgramStore.DepthFunc ALWAYS;
-    enum_constant public static final android.renderscript.ProgramStore.DepthFunc EQUAL;
-    enum_constant public static final android.renderscript.ProgramStore.DepthFunc GREATER;
-    enum_constant public static final android.renderscript.ProgramStore.DepthFunc GREATER_OR_EQUAL;
-    enum_constant public static final android.renderscript.ProgramStore.DepthFunc LESS;
-    enum_constant public static final android.renderscript.ProgramStore.DepthFunc LESS_OR_EQUAL;
-    enum_constant public static final android.renderscript.ProgramStore.DepthFunc NOT_EQUAL;
+    enum_constant public static final deprecated android.renderscript.ProgramStore.DepthFunc ALWAYS;
+    enum_constant public static final deprecated android.renderscript.ProgramStore.DepthFunc EQUAL;
+    enum_constant public static final deprecated android.renderscript.ProgramStore.DepthFunc GREATER;
+    enum_constant public static final deprecated android.renderscript.ProgramStore.DepthFunc GREATER_OR_EQUAL;
+    enum_constant public static final deprecated android.renderscript.ProgramStore.DepthFunc LESS;
+    enum_constant public static final deprecated android.renderscript.ProgramStore.DepthFunc LESS_OR_EQUAL;
+    enum_constant public static final deprecated android.renderscript.ProgramStore.DepthFunc NOT_EQUAL;
   }
 
-  public class ProgramVertex extends android.renderscript.Program {
-    method public android.renderscript.Element getInput(int);
-    method public int getInputCount();
+  public deprecated class ProgramVertex extends android.renderscript.Program {
   }
 
-  public static class ProgramVertex.Builder extends android.renderscript.Program.BaseProgramBuilder {
-    ctor public ProgramVertex.Builder(android.renderscript.RenderScript);
-    method public android.renderscript.ProgramVertex.Builder addInput(android.renderscript.Element) throws java.lang.IllegalStateException;
-    method public android.renderscript.ProgramVertex create();
+  public static deprecated class ProgramVertex.Builder extends android.renderscript.Program.BaseProgramBuilder {
+    ctor public deprecated ProgramVertex.Builder(android.renderscript.RenderScript);
+    method public deprecated android.renderscript.ProgramVertex.Builder addInput(android.renderscript.Element) throws java.lang.IllegalStateException;
+    method public deprecated android.renderscript.ProgramVertex create();
   }
 
-  public class ProgramVertexFixedFunction extends android.renderscript.ProgramVertex {
-    method public void bindConstants(android.renderscript.ProgramVertexFixedFunction.Constants);
+  public deprecated class ProgramVertexFixedFunction extends android.renderscript.ProgramVertex {
+    method public deprecated void bindConstants(android.renderscript.ProgramVertexFixedFunction.Constants);
   }
 
   public static class ProgramVertexFixedFunction.Builder {
-    ctor public ProgramVertexFixedFunction.Builder(android.renderscript.RenderScript);
-    method public android.renderscript.ProgramVertexFixedFunction create();
-    method public android.renderscript.ProgramVertexFixedFunction.Builder setTextureMatrixEnable(boolean);
+    ctor public deprecated ProgramVertexFixedFunction.Builder(android.renderscript.RenderScript);
+    method public deprecated android.renderscript.ProgramVertexFixedFunction create();
+    method public deprecated android.renderscript.ProgramVertexFixedFunction.Builder setTextureMatrixEnable(boolean);
   }
 
-  public static class ProgramVertexFixedFunction.Constants {
-    ctor public ProgramVertexFixedFunction.Constants(android.renderscript.RenderScript);
-    method public void destroy();
-    method public void setModelview(android.renderscript.Matrix4f);
-    method public void setProjection(android.renderscript.Matrix4f);
-    method public void setTexture(android.renderscript.Matrix4f);
+  public static deprecated class ProgramVertexFixedFunction.Constants {
+    ctor public deprecated ProgramVertexFixedFunction.Constants(android.renderscript.RenderScript);
+    method public deprecated void destroy();
+    method public deprecated void setModelview(android.renderscript.Matrix4f);
+    method public deprecated void setProjection(android.renderscript.Matrix4f);
+    method public deprecated void setTexture(android.renderscript.Matrix4f);
   }
 
-  public class RSDriverException extends android.renderscript.RSRuntimeException {
+  public deprecated class RSDriverException extends android.renderscript.RSRuntimeException {
     ctor public RSDriverException(java.lang.String);
   }
 
-  public class RSIllegalArgumentException extends android.renderscript.RSRuntimeException {
-    ctor public RSIllegalArgumentException(java.lang.String);
+  public deprecated class RSIllegalArgumentException extends android.renderscript.RSRuntimeException {
+    ctor public deprecated RSIllegalArgumentException(java.lang.String);
   }
 
-  public class RSInvalidStateException extends android.renderscript.RSRuntimeException {
-    ctor public RSInvalidStateException(java.lang.String);
+  public deprecated class RSInvalidStateException extends android.renderscript.RSRuntimeException {
+    ctor public deprecated RSInvalidStateException(java.lang.String);
   }
 
-  public class RSRuntimeException extends java.lang.RuntimeException {
-    ctor public RSRuntimeException(java.lang.String);
+  public deprecated class RSRuntimeException extends java.lang.RuntimeException {
+    ctor public deprecated RSRuntimeException(java.lang.String);
   }
 
-  public class RSSurfaceView extends android.view.SurfaceView implements android.view.SurfaceHolder.Callback {
-    ctor public RSSurfaceView(android.content.Context);
-    ctor public RSSurfaceView(android.content.Context, android.util.AttributeSet);
+  public deprecated class RSSurfaceView extends android.view.SurfaceView implements android.view.SurfaceHolder.Callback {
+    ctor public deprecated RSSurfaceView(android.content.Context);
+    ctor public deprecated RSSurfaceView(android.content.Context, android.util.AttributeSet);
     method public android.renderscript.RenderScriptGL createRenderScriptGL(android.renderscript.RenderScriptGL.SurfaceConfig);
     method public void destroyRenderScriptGL();
     method public android.renderscript.RenderScriptGL getRenderScriptGL();
-    method public void pause();
-    method public void resume();
+    method public deprecated void pause();
+    method public deprecated void resume();
     method public void setRenderScriptGL(android.renderscript.RenderScriptGL);
-    method public void surfaceChanged(android.view.SurfaceHolder, int, int, int);
-    method public void surfaceCreated(android.view.SurfaceHolder);
-    method public void surfaceDestroyed(android.view.SurfaceHolder);
+    method public deprecated void surfaceChanged(android.view.SurfaceHolder, int, int, int);
+    method public deprecated void surfaceCreated(android.view.SurfaceHolder);
+    method public deprecated void surfaceDestroyed(android.view.SurfaceHolder);
   }
 
-  public class RSTextureView extends android.view.TextureView implements android.view.TextureView.SurfaceTextureListener {
-    ctor public RSTextureView(android.content.Context);
-    ctor public RSTextureView(android.content.Context, android.util.AttributeSet);
-    method public android.renderscript.RenderScriptGL createRenderScriptGL(android.renderscript.RenderScriptGL.SurfaceConfig);
-    method public void destroyRenderScriptGL();
-    method public android.renderscript.RenderScriptGL getRenderScriptGL();
+  public deprecated class RSTextureView extends android.view.TextureView implements android.view.TextureView.SurfaceTextureListener {
+    ctor public deprecated RSTextureView(android.content.Context);
+    ctor public deprecated RSTextureView(android.content.Context, android.util.AttributeSet);
+    method public deprecated android.renderscript.RenderScriptGL createRenderScriptGL(android.renderscript.RenderScriptGL.SurfaceConfig);
+    method public deprecated void destroyRenderScriptGL();
+    method public deprecated android.renderscript.RenderScriptGL getRenderScriptGL();
     method public void onSurfaceTextureAvailable(android.graphics.SurfaceTexture, int, int);
     method public boolean onSurfaceTextureDestroyed(android.graphics.SurfaceTexture);
     method public void onSurfaceTextureSizeChanged(android.graphics.SurfaceTexture, int, int);
     method public void onSurfaceTextureUpdated(android.graphics.SurfaceTexture);
-    method public void pause();
-    method public void resume();
-    method public void setRenderScriptGL(android.renderscript.RenderScriptGL);
+    method public deprecated void pause();
+    method public deprecated void resume();
+    method public deprecated void setRenderScriptGL(android.renderscript.RenderScriptGL);
   }
 
-  public class RenderScript {
-    method public void contextDump();
-    method public static android.renderscript.RenderScript create(android.content.Context);
-    method public void destroy();
-    method public void finish();
-    method public final android.content.Context getApplicationContext();
+  public deprecated class RenderScript {
+    method public deprecated void contextDump();
+    method public static deprecated android.renderscript.RenderScript create(android.content.Context);
+    method public deprecated void destroy();
+    method public deprecated void finish();
+    method public final deprecated android.content.Context getApplicationContext();
     method public android.renderscript.RenderScript.RSErrorHandler getErrorHandler();
     method public android.renderscript.RenderScript.RSMessageHandler getMessageHandler();
     method public void setErrorHandler(android.renderscript.RenderScript.RSErrorHandler);
     method public void setMessageHandler(android.renderscript.RenderScript.RSMessageHandler);
-    method public void setPriority(android.renderscript.RenderScript.Priority);
+    method public deprecated void setPriority(android.renderscript.RenderScript.Priority);
   }
 
-  public static final class RenderScript.Priority extends java.lang.Enum {
+  public static final deprecated class RenderScript.Priority extends java.lang.Enum {
     method public static android.renderscript.RenderScript.Priority valueOf(java.lang.String);
     method public static final android.renderscript.RenderScript.Priority[] values();
     enum_constant public static final android.renderscript.RenderScript.Priority LOW;
     enum_constant public static final android.renderscript.RenderScript.Priority NORMAL;
   }
 
-  public static class RenderScript.RSErrorHandler implements java.lang.Runnable {
+  public static deprecated class RenderScript.RSErrorHandler implements java.lang.Runnable {
     ctor public RenderScript.RSErrorHandler();
     method public void run();
     field protected java.lang.String mErrorMessage;
     field protected int mErrorNum;
   }
 
-  public static class RenderScript.RSMessageHandler implements java.lang.Runnable {
+  public static deprecated class RenderScript.RSMessageHandler implements java.lang.Runnable {
     ctor public RenderScript.RSMessageHandler();
     method public void run();
     field protected int[] mData;
@@ -19135,45 +19095,40 @@
     field protected int mLength;
   }
 
-  public class RenderScriptGL extends android.renderscript.RenderScript {
-    ctor public RenderScriptGL(android.content.Context, android.renderscript.RenderScriptGL.SurfaceConfig);
-    method public void bindProgramFragment(android.renderscript.ProgramFragment);
-    method public void bindProgramRaster(android.renderscript.ProgramRaster);
-    method public void bindProgramStore(android.renderscript.ProgramStore);
-    method public void bindProgramVertex(android.renderscript.ProgramVertex);
-    method public void bindRootScript(android.renderscript.Script);
-    method public int getHeight();
-    method public int getWidth();
-    method public void pause();
-    method public void resume();
-    method public void setSurface(android.view.SurfaceHolder, int, int);
-    method public void setSurfaceTexture(android.graphics.SurfaceTexture, int, int);
+  public deprecated class RenderScriptGL extends android.renderscript.RenderScript {
+    ctor public deprecated RenderScriptGL(android.content.Context, android.renderscript.RenderScriptGL.SurfaceConfig);
+    method public deprecated void bindProgramFragment(android.renderscript.ProgramFragment);
+    method public deprecated void bindProgramRaster(android.renderscript.ProgramRaster);
+    method public deprecated void bindProgramStore(android.renderscript.ProgramStore);
+    method public deprecated void bindProgramVertex(android.renderscript.ProgramVertex);
+    method public deprecated void bindRootScript(android.renderscript.Script);
+    method public deprecated int getHeight();
+    method public deprecated int getWidth();
+    method public deprecated void pause();
+    method public deprecated void resume();
+    method public deprecated void setSurface(android.view.SurfaceHolder, int, int);
+    method public deprecated void setSurfaceTexture(android.graphics.SurfaceTexture, int, int);
   }
 
-  public static class RenderScriptGL.SurfaceConfig {
+  public static deprecated class RenderScriptGL.SurfaceConfig {
     ctor public RenderScriptGL.SurfaceConfig();
     ctor public RenderScriptGL.SurfaceConfig(android.renderscript.RenderScriptGL.SurfaceConfig);
-    method public void setAlpha(int, int);
-    method public void setColor(int, int);
-    method public void setDepth(int, int);
-    method public void setSamples(int, int, float);
+    method public deprecated void setAlpha(int, int);
+    method public deprecated void setColor(int, int);
+    method public deprecated void setDepth(int, int);
+    method public deprecated void setSamples(int, int, float);
   }
 
-  public class Sampler extends android.renderscript.BaseObj {
-    method public static android.renderscript.Sampler CLAMP_LINEAR(android.renderscript.RenderScript);
-    method public static android.renderscript.Sampler CLAMP_LINEAR_MIP_LINEAR(android.renderscript.RenderScript);
-    method public static android.renderscript.Sampler CLAMP_NEAREST(android.renderscript.RenderScript);
-    method public static android.renderscript.Sampler WRAP_LINEAR(android.renderscript.RenderScript);
-    method public static android.renderscript.Sampler WRAP_LINEAR_MIP_LINEAR(android.renderscript.RenderScript);
-    method public static android.renderscript.Sampler WRAP_NEAREST(android.renderscript.RenderScript);
-    method public float getAnisotropy();
-    method public android.renderscript.Sampler.Value getMagnification();
-    method public android.renderscript.Sampler.Value getMinification();
-    method public android.renderscript.Sampler.Value getWrapS();
-    method public android.renderscript.Sampler.Value getWrapT();
+  public deprecated class Sampler extends android.renderscript.BaseObj {
+    method public static deprecated android.renderscript.Sampler CLAMP_LINEAR(android.renderscript.RenderScript);
+    method public static deprecated android.renderscript.Sampler CLAMP_LINEAR_MIP_LINEAR(android.renderscript.RenderScript);
+    method public static deprecated android.renderscript.Sampler CLAMP_NEAREST(android.renderscript.RenderScript);
+    method public static deprecated android.renderscript.Sampler WRAP_LINEAR(android.renderscript.RenderScript);
+    method public static deprecated android.renderscript.Sampler WRAP_LINEAR_MIP_LINEAR(android.renderscript.RenderScript);
+    method public static deprecated android.renderscript.Sampler WRAP_NEAREST(android.renderscript.RenderScript);
   }
 
-  public static class Sampler.Builder {
+  public static deprecated class Sampler.Builder {
     ctor public Sampler.Builder(android.renderscript.RenderScript);
     method public android.renderscript.Sampler create();
     method public void setAnisotropy(float);
@@ -19183,30 +19138,30 @@
     method public void setWrapT(android.renderscript.Sampler.Value);
   }
 
-  public static final class Sampler.Value extends java.lang.Enum {
+  public static final deprecated class Sampler.Value extends java.lang.Enum {
     method public static android.renderscript.Sampler.Value valueOf(java.lang.String);
     method public static final android.renderscript.Sampler.Value[] values();
-    enum_constant public static final android.renderscript.Sampler.Value CLAMP;
-    enum_constant public static final android.renderscript.Sampler.Value LINEAR;
-    enum_constant public static final android.renderscript.Sampler.Value LINEAR_MIP_LINEAR;
-    enum_constant public static final android.renderscript.Sampler.Value LINEAR_MIP_NEAREST;
-    enum_constant public static final android.renderscript.Sampler.Value NEAREST;
-    enum_constant public static final android.renderscript.Sampler.Value WRAP;
+    enum_constant public static final deprecated android.renderscript.Sampler.Value CLAMP;
+    enum_constant public static final deprecated android.renderscript.Sampler.Value LINEAR;
+    enum_constant public static final deprecated android.renderscript.Sampler.Value LINEAR_MIP_LINEAR;
+    enum_constant public static final deprecated android.renderscript.Sampler.Value LINEAR_MIP_NEAREST;
+    enum_constant public static final deprecated android.renderscript.Sampler.Value NEAREST;
+    enum_constant public static final deprecated android.renderscript.Sampler.Value WRAP;
   }
 
-  public class Script extends android.renderscript.BaseObj {
-    method public void bindAllocation(android.renderscript.Allocation, int);
-    method protected void forEach(int, android.renderscript.Allocation, android.renderscript.Allocation, android.renderscript.FieldPacker);
-    method protected void invoke(int);
-    method protected void invoke(int, android.renderscript.FieldPacker);
-    method public void setTimeZone(java.lang.String);
-    method public void setVar(int, float);
-    method public void setVar(int, double);
-    method public void setVar(int, int);
-    method public void setVar(int, long);
-    method public void setVar(int, boolean);
-    method public void setVar(int, android.renderscript.BaseObj);
-    method public void setVar(int, android.renderscript.FieldPacker);
+  public deprecated class Script extends android.renderscript.BaseObj {
+    method public deprecated void bindAllocation(android.renderscript.Allocation, int);
+    method protected deprecated void forEach(int, android.renderscript.Allocation, android.renderscript.Allocation, android.renderscript.FieldPacker);
+    method protected deprecated void invoke(int);
+    method protected deprecated void invoke(int, android.renderscript.FieldPacker);
+    method public deprecated void setTimeZone(java.lang.String);
+    method public deprecated void setVar(int, float);
+    method public deprecated void setVar(int, double);
+    method public deprecated void setVar(int, int);
+    method public deprecated void setVar(int, long);
+    method public deprecated void setVar(int, boolean);
+    method public deprecated void setVar(int, android.renderscript.BaseObj);
+    method public deprecated void setVar(int, android.renderscript.FieldPacker);
   }
 
   public static class Script.Builder {
@@ -19224,19 +19179,19 @@
     field protected android.renderscript.Element mElement;
   }
 
-  public class ScriptC extends android.renderscript.Script {
-    ctor protected ScriptC(int, android.renderscript.RenderScript);
-    ctor protected ScriptC(android.renderscript.RenderScript, android.content.res.Resources, int);
+  public deprecated class ScriptC extends android.renderscript.Script {
+    ctor protected deprecated ScriptC(int, android.renderscript.RenderScript);
+    ctor protected deprecated ScriptC(android.renderscript.RenderScript, android.content.res.Resources, int);
   }
 
-  public class Short2 {
+  public deprecated class Short2 {
     ctor public Short2();
     ctor public Short2(short, short);
     field public short x;
     field public short y;
   }
 
-  public class Short3 {
+  public deprecated class Short3 {
     ctor public Short3();
     ctor public Short3(short, short, short);
     field public short x;
@@ -19244,7 +19199,7 @@
     field public short z;
   }
 
-  public class Short4 {
+  public deprecated class Short4 {
     ctor public Short4();
     ctor public Short4(short, short, short, short);
     field public short w;
@@ -19253,22 +19208,22 @@
     field public short z;
   }
 
-  public class Type extends android.renderscript.BaseObj {
-    method public int getCount();
-    method public android.renderscript.Element getElement();
-    method public int getX();
-    method public int getY();
-    method public int getZ();
-    method public boolean hasFaces();
-    method public boolean hasMipmaps();
+  public deprecated class Type extends android.renderscript.BaseObj {
+    method public deprecated int getCount();
+    method public deprecated android.renderscript.Element getElement();
+    method public deprecated int getX();
+    method public deprecated int getY();
+    method public deprecated int getZ();
+    method public deprecated boolean hasFaces();
+    method public deprecated boolean hasMipmaps();
   }
 
-  public static class Type.Builder {
-    ctor public Type.Builder(android.renderscript.RenderScript, android.renderscript.Element);
-    method public android.renderscript.Type create();
+  public static deprecated class Type.Builder {
+    ctor public deprecated Type.Builder(android.renderscript.RenderScript, android.renderscript.Element);
+    method public deprecated android.renderscript.Type create();
     method public android.renderscript.Type.Builder setFaces(boolean);
     method public android.renderscript.Type.Builder setMipmaps(boolean);
-    method public android.renderscript.Type.Builder setX(int);
+    method public deprecated android.renderscript.Type.Builder setX(int);
     method public android.renderscript.Type.Builder setY(int);
   }
 
diff --git a/graphics/java/android/renderscript/Allocation.java b/graphics/java/android/renderscript/Allocation.java
index 10ccb87..6b1d66f 100644
--- a/graphics/java/android/renderscript/Allocation.java
+++ b/graphics/java/android/renderscript/Allocation.java
@@ -27,7 +27,7 @@
 import android.util.Log;
 import android.util.TypedValue;
 
-/**
+/** @deprecated renderscript is deprecated in J
  * <p>
  * Memory allocation class for renderscript.  An allocation combines a
  * {@link android.renderscript.Type} with the memory to provide storage for user data and objects.
@@ -93,7 +93,7 @@
     int mCurrentCount;
 
 
-    /**
+    /** @deprecated renderscript is deprecated in J
      * The usage of the allocation.  These signal to renderscript
      * where to place the allocation in memory.
      *
@@ -102,14 +102,14 @@
      */
     public static final int USAGE_SCRIPT = 0x0001;
 
-    /**
+    /** @deprecated renderscript is deprecated in J
      * GRAPHICS_TEXTURE The allocation will be used as a texture
      * source by one or more graphics programs.
      *
      */
     public static final int USAGE_GRAPHICS_TEXTURE = 0x0002;
 
-    /**
+    /** @deprecated renderscript is deprecated in J
      * GRAPHICS_VERTEX The allocation will be used as a graphics
      * mesh.
      *
@@ -117,21 +117,21 @@
     public static final int USAGE_GRAPHICS_VERTEX = 0x0004;
 
 
-    /**
+    /** @deprecated renderscript is deprecated in J
      * GRAPHICS_CONSTANTS The allocation will be used as the source
      * of shader constants by one or more programs.
      *
      */
     public static final int USAGE_GRAPHICS_CONSTANTS = 0x0008;
 
-    /**
+    /** @deprecated renderscript is deprecated in J
      * USAGE_GRAPHICS_RENDER_TARGET The allocation will be used as a
      * target for offscreen rendering
      *
      */
     public static final int USAGE_GRAPHICS_RENDER_TARGET = 0x0010;
 
-    /**
+    /** @hide renderscript is deprecated in J
      * USAGE_IO_INPUT The allocation will be used as SurfaceTexture
      * consumer.  This usage will cause the allocation to be created
      * read only.
@@ -139,7 +139,7 @@
      */
     public static final int USAGE_IO_INPUT = 0x0020;
 
-    /**
+    /** @hide renderscript is deprecated in J
      * USAGE_IO_OUTPUT The allocation will be used as a
      * SurfaceTexture producer.  The dimensions and format of the
      * SurfaceTexture will be forced to those of the allocation.
@@ -147,25 +147,25 @@
      */
     public static final int USAGE_IO_OUTPUT = 0x0040;
 
-    /**
+    /** @deprecated renderscript is deprecated in J
      * Controls mipmap behavior when using the bitmap creation and
      * update functions.
      */
     public enum MipmapControl {
-        /**
+        /** @deprecated renderscript is deprecated in J
          * No mipmaps will be generated and the type generated from the
          * incoming bitmap will not contain additional LODs.
          */
         MIPMAP_NONE(0),
 
-        /**
+        /** @deprecated renderscript is deprecated in J
          * A Full mipmap chain will be created in script memory.  The
          * type of the allocation will contain a full mipmap chain.  On
          * upload to graphics the full chain will be transfered.
          */
         MIPMAP_FULL(1),
 
-        /**
+        /** @deprecated renderscript is deprecated in J
          * The type of the allocation will be the same as MIPMAP_NONE.
          * It will not contain mipmaps.  On upload to graphics the
          * graphics copy of the allocation data will contain a full
@@ -188,7 +188,7 @@
     }
 
 
-   /**
+   /** @hide renderscript is deprecated in J
      * Get the element of the type of the Allocation.
      *
      * @return Element that describes the structure of data in the
@@ -199,7 +199,7 @@
         return mType.getElement();
     }
 
-    /**
+    /** @hide renderscript is deprecated in J
      * Get the usage flags of the Allocation.
      *
      * @return usage flags associated with the allocation. e.g.
@@ -210,7 +210,7 @@
         return mUsage;
     }
 
-    /**
+    /** @hide renderscript is deprecated in J
      * Get the size of the Allocation in bytes.
      *
      * @return size of the Allocation in bytes.
@@ -326,7 +326,7 @@
         }
     }
 
-    /**
+    /** @deprecated renderscript is deprecated in J
      * Get the type of the Allocation.
      *
      * @return Type
@@ -336,7 +336,7 @@
         return mType;
     }
 
-    /**
+    /** @deprecated renderscript is deprecated in J
      * Propagate changes from one usage of the allocation to the
      * remaining usages of the allocation.
      *
@@ -355,7 +355,7 @@
         mRS.nAllocationSyncAll(getIDSafe(), srcLocation);
     }
 
-    /**
+    /** @hide renderscript is deprecated in J
      * Send a buffer to the output stream.  The contents of the
      * Allocation will be undefined after this operation.
      *
@@ -369,7 +369,7 @@
         mRS.nAllocationIoSend(getID(mRS));
     }
 
-    /**
+    /** @deprecated renderscript is deprecated in J
      * Delete once code is updated.
      * @hide
      */
@@ -377,7 +377,7 @@
         ioSend();
     }
 
-    /**
+    /** @hide renderscript is deprecated in J
      * Receive the latest input into the Allocation.
      *
      */
@@ -390,7 +390,7 @@
         mRS.nAllocationIoReceive(getID(mRS));
     }
 
-    /**
+    /** @deprecated renderscript is deprecated in J
      * Copy an array of RS objects to the allocation.
      *
      * @param d Source array.
@@ -461,7 +461,7 @@
         }
     }
 
-    /**
+    /** @deprecated renderscript is deprecated in J
      * Copy an allocation from an array.  This variant is not type
      * checked which allows an application to fill in structured
      * data from an array.
@@ -472,7 +472,7 @@
         mRS.validate();
         copy1DRangeFromUnchecked(0, mCurrentCount, d);
     }
-    /**
+    /** @deprecated renderscript is deprecated in J
      * Copy an allocation from an array.  This variant is not type
      * checked which allows an application to fill in structured
      * data from an array.
@@ -483,7 +483,7 @@
         mRS.validate();
         copy1DRangeFromUnchecked(0, mCurrentCount, d);
     }
-    /**
+    /** @deprecated renderscript is deprecated in J
      * Copy an allocation from an array.  This variant is not type
      * checked which allows an application to fill in structured
      * data from an array.
@@ -494,7 +494,7 @@
         mRS.validate();
         copy1DRangeFromUnchecked(0, mCurrentCount, d);
     }
-    /**
+    /** @deprecated renderscript is deprecated in J
      * Copy an allocation from an array.  This variant is not type
      * checked which allows an application to fill in structured
      * data from an array.
@@ -506,7 +506,7 @@
         copy1DRangeFromUnchecked(0, mCurrentCount, d);
     }
 
-    /**
+    /** @deprecated renderscript is deprecated in J
      * Copy an allocation from an array.  This variant is type
      * checked and will generate exceptions if the Allocation type
      * is not a 32 bit integer type.
@@ -518,7 +518,7 @@
         copy1DRangeFrom(0, mCurrentCount, d);
     }
 
-    /**
+    /** @deprecated renderscript is deprecated in J
      * Copy an allocation from an array.  This variant is type
      * checked and will generate exceptions if the Allocation type
      * is not a 16 bit integer type.
@@ -530,7 +530,7 @@
         copy1DRangeFrom(0, mCurrentCount, d);
     }
 
-    /**
+    /** @deprecated renderscript is deprecated in J
      * Copy an allocation from an array.  This variant is type
      * checked and will generate exceptions if the Allocation type
      * is not a 8 bit integer type.
@@ -542,7 +542,7 @@
         copy1DRangeFrom(0, mCurrentCount, d);
     }
 
-    /**
+    /** @deprecated renderscript is deprecated in J
      * Copy an allocation from an array.  This variant is type
      * checked and will generate exceptions if the Allocation type
      * is not a 32 bit float type.
@@ -554,7 +554,7 @@
         copy1DRangeFrom(0, mCurrentCount, d);
     }
 
-    /**
+    /** @deprecated renderscript is deprecated in J
      * Copy an allocation from a bitmap.  The height, width, and
      * format of the bitmap must match the existing allocation.
      *
@@ -567,7 +567,7 @@
         mRS.nAllocationCopyFromBitmap(getID(mRS), b);
     }
 
-    /**
+    /** @deprecated renderscript is deprecated in J
      * This is only intended to be used by auto-generate code reflected from the
      * renderscript script files.
      *
@@ -587,7 +587,7 @@
         copy1DRangeFromUnchecked(xoff, count, data);
     }
 
-    /**
+    /** @deprecated renderscript is deprecated in J
      * This is only intended to be used by auto-generate code reflected from the
      * renderscript script files.
      *
@@ -634,7 +634,7 @@
         }
     }
 
-    /**
+    /** @deprecated renderscript is deprecated in J
      * Generate a mipmap chain.  Requires the type of the allocation
      * include mipmaps.
      *
@@ -648,7 +648,7 @@
         mRS.nAllocationGenerateMipmaps(getID(mRS));
     }
 
-    /**
+    /** @deprecated renderscript is deprecated in J
      * Copy part of an allocation from an array.  This variant is
      * not type checked which allows an application to fill in
      * structured data from an array.
@@ -662,7 +662,7 @@
         data1DChecks(off, count, d.length * 4, dataSize);
         mRS.nAllocationData1D(getIDSafe(), off, mSelectedLOD, count, d, dataSize);
     }
-    /**
+    /** @deprecated renderscript is deprecated in J
      * Copy part of an allocation from an array.  This variant is
      * not type checked which allows an application to fill in
      * structured data from an array.
@@ -676,7 +676,7 @@
         data1DChecks(off, count, d.length * 2, dataSize);
         mRS.nAllocationData1D(getIDSafe(), off, mSelectedLOD, count, d, dataSize);
     }
-    /**
+    /** @deprecated renderscript is deprecated in J
      * Copy part of an allocation from an array.  This variant is
      * not type checked which allows an application to fill in
      * structured data from an array.
@@ -690,7 +690,7 @@
         data1DChecks(off, count, d.length, dataSize);
         mRS.nAllocationData1D(getIDSafe(), off, mSelectedLOD, count, d, dataSize);
     }
-    /**
+    /** @deprecated renderscript is deprecated in J
      * Copy part of an allocation from an array.  This variant is
      * not type checked which allows an application to fill in
      * structured data from an array.
@@ -705,7 +705,7 @@
         mRS.nAllocationData1D(getIDSafe(), off, mSelectedLOD, count, d, dataSize);
     }
 
-    /**
+    /** @deprecated renderscript is deprecated in J
      * Copy part of an allocation from an array.  This variant is
      * type checked and will generate exceptions if the Allocation
      * type is not a 32 bit integer type.
@@ -719,7 +719,7 @@
         copy1DRangeFromUnchecked(off, count, d);
     }
 
-    /**
+    /** @deprecated renderscript is deprecated in J
      * Copy part of an allocation from an array.  This variant is
      * type checked and will generate exceptions if the Allocation
      * type is not a 16 bit integer type.
@@ -733,7 +733,7 @@
         copy1DRangeFromUnchecked(off, count, d);
     }
 
-    /**
+    /** @deprecated renderscript is deprecated in J
      * Copy part of an allocation from an array.  This variant is
      * type checked and will generate exceptions if the Allocation
      * type is not a 8 bit integer type.
@@ -747,7 +747,7 @@
         copy1DRangeFromUnchecked(off, count, d);
     }
 
-    /**
+    /** @deprecated renderscript is deprecated in J
      * Copy part of an allocation from an array.  This variant is
      * type checked and will generate exceptions if the Allocation
      * type is not a 32 bit float type.
@@ -761,7 +761,7 @@
         copy1DRangeFromUnchecked(off, count, d);
     }
 
-     /**
+     /** @deprecated renderscript is deprecated in J
      * Copy part of an allocation from another allocation.
      *
      * @param off The offset of the first element to be copied.
@@ -794,7 +794,7 @@
         }
     }
 
-    /**
+    /** @deprecated renderscript is deprecated in J
      * Copy a rectangular region from the array into the allocation.
      * The incoming array is assumed to be tightly packed.
      *
@@ -811,6 +811,8 @@
                               w, h, data, data.length);
     }
 
+    /** @deprecated renderscript is deprecated in J
+     */
     public void copy2DRangeFrom(int xoff, int yoff, int w, int h, short[] data) {
         mRS.validate();
         validate2DRange(xoff, yoff, w, h);
@@ -818,6 +820,8 @@
                               w, h, data, data.length * 2);
     }
 
+    /** @deprecated renderscript is deprecated in J
+     */
     public void copy2DRangeFrom(int xoff, int yoff, int w, int h, int[] data) {
         mRS.validate();
         validate2DRange(xoff, yoff, w, h);
@@ -825,6 +829,8 @@
                               w, h, data, data.length * 4);
     }
 
+    /** @deprecated renderscript is deprecated in J
+     */
     public void copy2DRangeFrom(int xoff, int yoff, int w, int h, float[] data) {
         mRS.validate();
         validate2DRange(xoff, yoff, w, h);
@@ -832,7 +838,7 @@
                               w, h, data, data.length * 4);
     }
 
-    /**
+    /** @deprecated renderscript is deprecated in J
      * Copy a rectangular region into the allocation from another
      * allocation.
      *
@@ -854,7 +860,7 @@
                               data.mSelectedLOD, data.mSelectedFace.mID);
     }
 
-    /**
+    /** @deprecated renderscript is deprecated in J
      * Copy a bitmap into an allocation.  The height and width of
      * the update will use the height and width of the incoming
      * bitmap.
@@ -871,7 +877,7 @@
     }
 
 
-    /**
+    /** @deprecated renderscript is deprecated in J
      * Copy from the Allocation into a Bitmap.  The bitmap must
      * match the dimensions of the Allocation.
      *
@@ -884,7 +890,7 @@
         mRS.nAllocationCopyToBitmap(getID(mRS), b);
     }
 
-    /**
+    /** @deprecated renderscript is deprecated in J
      * Copy from the Allocation into a byte array.  The array must
      * be at least as large as the Allocation.  The allocation must
      * be of an 8 bit elemental type.
@@ -897,7 +903,7 @@
         mRS.nAllocationRead(getID(mRS), d);
     }
 
-    /**
+    /** @deprecated renderscript is deprecated in J
      * Copy from the Allocation into a short array.  The array must
      * be at least as large as the Allocation.  The allocation must
      * be of an 16 bit elemental type.
@@ -910,7 +916,7 @@
         mRS.nAllocationRead(getID(mRS), d);
     }
 
-    /**
+    /** @deprecated renderscript is deprecated in J
      * Copy from the Allocation into a int array.  The array must be
      * at least as large as the Allocation.  The allocation must be
      * of an 32 bit elemental type.
@@ -923,7 +929,7 @@
         mRS.nAllocationRead(getID(mRS), d);
     }
 
-    /**
+    /** @deprecated renderscript is deprecated in J
      * Copy from the Allocation into a float array.  The array must
      * be at least as large as the Allocation.  The allocation must
      * be of an 32 bit float elemental type.
@@ -936,7 +942,7 @@
         mRS.nAllocationRead(getID(mRS), d);
     }
 
-    /**
+    /** @deprecated renderscript is deprecated in J
      * Resize a 1D allocation.  The contents of the allocation are
      * preserved.  If new elements are allocated objects are created
      * with null contents and the new region is otherwise undefined.
@@ -961,7 +967,7 @@
         updateCacheInfo(mType);
     }
 
-    /**
+    /** @deprecated renderscript is deprecated in J
      * Resize a 2D allocation.  The contents of the allocation are
      * preserved.  If new elements are allocated objects are created
      * with null contents and the new region is otherwise undefined.
@@ -1002,7 +1008,7 @@
         mBitmapOptions.inScaled = false;
     }
 
-    /**
+    /** @deprecated renderscript is deprecated in J
      *
      * @param type renderscript type describing data layout
      * @param mips specifies desired mipmap behaviour for the
@@ -1022,7 +1028,7 @@
         return new Allocation(id, rs, type, usage);
     }
 
-    /**
+    /** @deprecated renderscript is deprecated in J
      * Creates a renderscript allocation with the size specified by
      * the type and no mipmaps generated by default
      *
@@ -1037,7 +1043,7 @@
         return createTyped(rs, type, MipmapControl.MIPMAP_NONE, usage);
     }
 
-    /**
+    /** @deprecated renderscript is deprecated in J
      * Creates a renderscript allocation for use by the script with
      * the size specified by the type and no mipmaps generated by
      * default
@@ -1051,7 +1057,7 @@
         return createTyped(rs, type, MipmapControl.MIPMAP_NONE, USAGE_SCRIPT);
     }
 
-    /**
+    /** @deprecated renderscript is deprecated in J
      * Creates a renderscript allocation with a specified number of
      * given elements
      *
@@ -1077,7 +1083,7 @@
         return new Allocation(id, rs, t, usage);
     }
 
-    /**
+    /** @deprecated renderscript is deprecated in J
      * Creates a renderscript allocation with a specified number of
      * given elements
      *
@@ -1118,7 +1124,7 @@
         return tb.create();
     }
 
-    /**
+    /** @deprecated renderscript is deprecated in J
      * Creates a renderscript allocation from a bitmap
      *
      * @param rs Context to which the allocation will belong.
@@ -1144,7 +1150,7 @@
         return new Allocation(id, rs, t, usage);
     }
 
-    /**
+    /** @deprecated renderscript is deprecated in J
      *
      *
      * @hide
@@ -1162,7 +1168,7 @@
         return st;
     }
 
-    /**
+    /** @hide renderscript is deprecated in J
      * For allocations used with io operations, returns the handle
      * onto a raw buffer that is being managed by the screen
      * compositor.
@@ -1174,7 +1180,7 @@
         return new Surface(getSurfaceTexture());
     }
 
-    /**
+    /** @hide renderscript is deprecated in J
      * Associate a surface for io output with this allocation
      *
      * @param sur Surface to associate with allocation
@@ -1188,7 +1194,7 @@
         mRS.nAllocationSetSurface(getID(mRS), sur);
     }
 
-    /**
+    /** @deprecated renderscript is deprecated in J
      * @hide
      */
     public void setSurfaceTexture(SurfaceTexture st) {
@@ -1201,7 +1207,7 @@
         mRS.nAllocationSetSurface(getID(mRS), s);
     }
 
-    /**
+    /** @deprecated renderscript is deprecated in J
      * Creates a non-mipmapped renderscript allocation to use as a
      * graphics texture
      *
@@ -1216,7 +1222,7 @@
                                 USAGE_GRAPHICS_TEXTURE);
     }
 
-    /**
+    /** @deprecated renderscript is deprecated in J
      * Creates a cubemap allocation from a bitmap containing the
      * horizontal list of cube faces. Each individual face must be
      * the same size and power of 2
@@ -1264,7 +1270,7 @@
         return new Allocation(id, rs, t, usage);
     }
 
-    /**
+    /** @deprecated renderscript is deprecated in J
      * Creates a non-mipmapped cubemap allocation for use as a
      * graphics texture from a bitmap containing the horizontal list
      * of cube faces. Each individual face must be the same size and
@@ -1283,7 +1289,7 @@
                                        USAGE_GRAPHICS_TEXTURE);
     }
 
-    /**
+    /** @deprecated renderscript is deprecated in J
      * Creates a cubemap allocation from 6 bitmaps containing
      * the cube faces. All the faces must be the same size and
      * power of 2
@@ -1350,7 +1356,7 @@
         return cubemap;
     }
 
-    /**
+    /** @deprecated renderscript is deprecated in J
      * Creates a non-mipmapped cubemap allocation for use as a
      * graphics texture from 6 bitmaps containing
      * the cube faces. All the faces must be the same size and
@@ -1379,7 +1385,7 @@
                                           USAGE_GRAPHICS_TEXTURE);
     }
 
-    /**
+    /** @deprecated renderscript is deprecated in J
      * Creates a renderscript allocation from the bitmap referenced
      * by resource id
      *
@@ -1407,7 +1413,7 @@
         return alloc;
     }
 
-    /**
+    /** @deprecated renderscript is deprecated in J
      * Creates a non-mipmapped renderscript allocation to use as a
      * graphics texture from the bitmap referenced by resource id
      *
@@ -1426,7 +1432,7 @@
                                         USAGE_GRAPHICS_TEXTURE);
     }
 
-    /**
+    /** @deprecated renderscript is deprecated in J
      * Creates a renderscript allocation containing string data
      * encoded in UTF-8 format
      *
diff --git a/graphics/java/android/renderscript/AllocationAdapter.java b/graphics/java/android/renderscript/AllocationAdapter.java
index 85d86e5..3b5993a 100644
--- a/graphics/java/android/renderscript/AllocationAdapter.java
+++ b/graphics/java/android/renderscript/AllocationAdapter.java
@@ -21,7 +21,7 @@
 import android.graphics.BitmapFactory;
 import android.util.TypedValue;
 
-/**
+/** @deprecated renderscript is deprecated in J
  *
  **/
 public class AllocationAdapter extends Allocation {
@@ -129,7 +129,7 @@
         mSelectedZ = 0;
     }
 
-    /**
+    /** @deprecated renderscript is deprecated in J
      * Set the active LOD.  The LOD must be within the range for the
      * type being adapted.  The base allocation must have mipmaps.
      *
@@ -149,7 +149,7 @@
         initLOD(lod);
     }
 
-    /**
+    /** @deprecated renderscript is deprecated in J
      * Set the active Face.  The base allocation must be of a type
      * that includes faces.
      *
@@ -169,7 +169,7 @@
         mSelectedFace = cf;
     }
 
-    /**
+    /** @deprecated renderscript is deprecated in J
      * Set the active Y.  The y value must be within the range for
      * the allocation being adapted.  The base allocation must
      * contain the Y dimension.
@@ -190,7 +190,7 @@
         mSelectedY = y;
     }
 
-    /**
+    /** @deprecated renderscript is deprecated in J
      * Set the active Z.  The z value must be within the range for
      * the allocation being adapted.  The base allocation must
      * contain the Z dimension.
@@ -211,6 +211,8 @@
         mSelectedZ = z;
     }
 
+    /** @deprecated renderscript is deprecated in J
+     */
     static public AllocationAdapter create1D(RenderScript rs, Allocation a) {
         rs.validate();
         AllocationAdapter aa = new AllocationAdapter(0, rs, a);
@@ -222,6 +224,8 @@
         return aa;
     }
 
+    /** @deprecated renderscript is deprecated in J
+     */
     static public AllocationAdapter create2D(RenderScript rs, Allocation a) {
         android.util.Log.e("rs", "create2d " + a);
         rs.validate();
@@ -235,7 +239,7 @@
     }
 
 
-    /**
+    /** @deprecated renderscript is deprecated in J
      * Override the Allocation resize.  Resizing adapters is not
      * allowed and will throw a RSInvalidStateException.
      *
diff --git a/graphics/java/android/renderscript/BaseObj.java b/graphics/java/android/renderscript/BaseObj.java
index f464f9b..0d74212 100644
--- a/graphics/java/android/renderscript/BaseObj.java
+++ b/graphics/java/android/renderscript/BaseObj.java
@@ -18,7 +18,7 @@
 
 import android.util.Log;
 
-/**
+/** @deprecated renderscript is deprecated in J
  * BaseObj is the base class for interfacing with native renderscript objects.
  * It primarly contains code for tracking the native object ID and forcably
  * disconecting the object from the native allocation for early cleanup.
@@ -39,7 +39,7 @@
         mID = id;
     }
 
-    /**
+    /** @deprecated renderscript is deprecated in J
      * Lookup the native object ID for this object.  Primarily used by the
      * generated reflected code.
      *
@@ -73,7 +73,7 @@
     private String mName;
     RenderScript mRS;
 
-    /**
+    /** @deprecated renderscript is deprecated in J
      * setName assigns a name to an object.  This object can later be looked up
      * by this name.  This name will also be retained if the object is written
      * to an A3D file.
@@ -103,7 +103,7 @@
         }
     }
 
-    /**
+    /** @deprecated renderscript is deprecated in J
      * @return name of the renderscript object
      */
     public String getName() {
@@ -124,7 +124,7 @@
         super.finalize();
     }
 
-    /**
+    /** @deprecated renderscript is deprecated in J
      * destroy disconnects the object from the native object effectively
      * rendering this java object dead.  The primary use is to force immediate
      * cleanup of resources when it is believed the GC will not respond quickly
@@ -138,7 +138,7 @@
         mRS.nObjDestroy(mID);
     }
 
-    /**
+    /** @deprecated renderscript is deprecated in J
      * If an object came from an a3d file, java fields need to be
      * created with objects from the native layer
      */
@@ -147,7 +147,7 @@
         mName = mRS.nGetName(getID(mRS));
     }
 
-    /**
+    /** @deprecated renderscript is deprecated in J
      * Calculates the hash code value for a BaseObj.
      *
      * @return int
@@ -157,7 +157,7 @@
         return mID;
     }
 
-    /**
+    /** @deprecated renderscript is deprecated in J
      * Compare the current BaseObj with another BaseObj for equality.
      *
      * @param obj The object to check equality with.
diff --git a/graphics/java/android/renderscript/Byte2.java b/graphics/java/android/renderscript/Byte2.java
index 7df5f2e..163b8bd 100644
--- a/graphics/java/android/renderscript/Byte2.java
+++ b/graphics/java/android/renderscript/Byte2.java
@@ -20,7 +20,7 @@
 import android.util.Log;
 
 
-/**
+/** @deprecated renderscript is deprecated in J
  * Class for exposing the native Renderscript byte2 type back to the Android system.
  *
  **/
diff --git a/graphics/java/android/renderscript/Byte3.java b/graphics/java/android/renderscript/Byte3.java
index 02a01c1..eaa1d5f 100644
--- a/graphics/java/android/renderscript/Byte3.java
+++ b/graphics/java/android/renderscript/Byte3.java
@@ -20,7 +20,7 @@
 import android.util.Log;
 
 
-/**
+/** @deprecated renderscript is deprecated in J
  * Class for exposing the native Renderscript byte3 type back to the Android system.
  *
  **/
diff --git a/graphics/java/android/renderscript/Byte4.java b/graphics/java/android/renderscript/Byte4.java
index a55a696..e162f9d 100644
--- a/graphics/java/android/renderscript/Byte4.java
+++ b/graphics/java/android/renderscript/Byte4.java
@@ -20,7 +20,7 @@
 import android.util.Log;
 
 
-/**
+/** @deprecated renderscript is deprecated in J
  * Class for exposing the native Renderscript byte4 type back to the Android system.
  *
  **/
diff --git a/graphics/java/android/renderscript/Double2.java b/graphics/java/android/renderscript/Double2.java
index 9f4f328..0ef2f2b 100644
--- a/graphics/java/android/renderscript/Double2.java
+++ b/graphics/java/android/renderscript/Double2.java
@@ -20,7 +20,7 @@
 import android.util.Log;
 
 
-/**
+/** @deprecated renderscript is deprecated in J
  * Class for exposing the native Renderscript double2 type back
  * to the Android system.
  *
diff --git a/graphics/java/android/renderscript/Double3.java b/graphics/java/android/renderscript/Double3.java
index eb55142..09aba18 100644
--- a/graphics/java/android/renderscript/Double3.java
+++ b/graphics/java/android/renderscript/Double3.java
@@ -20,7 +20,7 @@
 import android.util.Log;
 
 
-/**
+/** @deprecated renderscript is deprecated in J
  * Class for exposing the native Renderscript double3 type back
  * to the Android system.
  *
diff --git a/graphics/java/android/renderscript/Double4.java b/graphics/java/android/renderscript/Double4.java
index 4755a76..c5211be 100644
--- a/graphics/java/android/renderscript/Double4.java
+++ b/graphics/java/android/renderscript/Double4.java
@@ -20,7 +20,7 @@
 import android.util.Log;
 
 
-/**
+/** @deprecated renderscript is deprecated in J
  * Class for exposing the native Renderscript double4 type back
  * to the Android system.
  *
diff --git a/graphics/java/android/renderscript/Element.java b/graphics/java/android/renderscript/Element.java
index 28914ce..babe57e 100644
--- a/graphics/java/android/renderscript/Element.java
+++ b/graphics/java/android/renderscript/Element.java
@@ -19,7 +19,7 @@
 import java.lang.reflect.Field;
 import android.util.Log;
 
-/**
+/** @deprecated renderscript is deprecated in J
  * <p>The most basic data type. An element represents one cell of a memory allocation.
  * Element is the basic data type of Renderscript. An element can be of two forms: Basic elements or Complex forms.
  * Examples of basic elements are:</p>
@@ -84,12 +84,12 @@
         }
     }
 
-    /**
+    /** @hide renderscript is deprecated in J
     * @return element size in bytes
     */
     public int getBytesSize() {return mSize;}
 
-    /**
+    /** @hide renderscript is deprecated in J
     * Returns the number of vector components. 2 for float2, 4 for
     * float4, etc.
     * @return element vector size
@@ -97,7 +97,7 @@
     public int getVectorSize() {return mVectorSize;}
 
 
-    /**
+    /** @deprecated renderscript is deprecated in J
      * DataType represents the basic type information for a basic element.  The
      * naming convention follows.  For numeric types it is FLOAT,
      * SIGNED, or UNSIGNED followed by the _BITS where BITS is the
@@ -114,6 +114,8 @@
      * RS_* objects.  32 bit opaque handles.
      */
     public enum DataType {
+        /** @hide
+        */
         NONE (0, 0),
         //FLOAT_16 (1, 2),
         FLOAT_32 (2, 4),
@@ -147,6 +149,8 @@
         RS_PROGRAM_VERTEX (1007, 4),
         RS_PROGRAM_RASTER (1008, 4),
         RS_PROGRAM_STORE (1009, 4),
+        /** @hide
+        */
         RS_FONT (1010, 4);
 
         int mID;
@@ -157,7 +161,7 @@
         }
     }
 
-    /**
+    /** @deprecated renderscript is deprecated in J
      * The special interpretation of the data if required.  This is primarly
      * useful for graphical data.  USER indicates no special interpretation is
      * expected.  PIXEL is used in conjunction with the standard data types for
@@ -179,7 +183,7 @@
         }
     }
 
-    /**
+    /** @deprecated renderscript is deprecated in J
      * Return if a element is too complex for use as a data source for a Mesh or
      * a Program.
      *
@@ -197,7 +201,7 @@
         return false;
     }
 
-    /**
+    /** @hide renderscript is deprecated in J
     * Elements could be simple, such as an int or a float, or a
     * structure with multiple sub elements, such as a collection of
     * floats, float2, float4. This function returns zero for simple
@@ -211,7 +215,7 @@
         return mVisibleElementMap.length;
     }
 
-    /**
+    /** @hide renderscript is deprecated in J
     * For complex elements, this function will return the
     * sub-element at index
     * @param index index of the sub-element to return
@@ -227,7 +231,7 @@
         return mElements[mVisibleElementMap[index]];
     }
 
-    /**
+    /** @hide renderscript is deprecated in J
     * For complex elements, this function will return the
     * sub-element name at index
     * @param index index of the sub-element
@@ -243,7 +247,7 @@
         return mElementNames[mVisibleElementMap[index]];
     }
 
-    /**
+    /** @hide renderscript is deprecated in J
     * For complex elements, some sub-elements could be statically
     * sized arrays. This function will return the array size for
     * sub-element at index
@@ -260,7 +264,7 @@
         return mArraySizes[mVisibleElementMap[index]];
     }
 
-    /**
+    /** @hide renderscript is deprecated in J
     * This function specifies the location of a sub-element within
     * the element
     * @param index index of the sub-element
@@ -276,21 +280,21 @@
         return mOffsetInBytes[mVisibleElementMap[index]];
     }
 
-    /**
+    /** @hide renderscript is deprecated in J
     * @return element data type
     */
     public DataType getDataType() {
         return mType;
     }
 
-    /**
+    /** @hide renderscript is deprecated in J
     * @return element data kind
     */
     public DataKind getDataKind() {
         return mKind;
     }
 
-    /**
+    /** @deprecated renderscript is deprecated in J
      * Utility function for returning an Element containing a single Boolean.
      *
      * @param rs Context to which the element will belong.
@@ -304,7 +308,7 @@
         return rs.mElement_BOOLEAN;
     }
 
-    /**
+    /** @deprecated renderscript is deprecated in J
      * Utility function for returning an Element containing a single UNSIGNED_8.
      *
      * @param rs Context to which the element will belong.
@@ -318,7 +322,7 @@
         return rs.mElement_U8;
     }
 
-    /**
+    /** @deprecated renderscript is deprecated in J
      * Utility function for returning an Element containing a single SIGNED_8.
      *
      * @param rs Context to which the element will belong.
@@ -332,6 +336,8 @@
         return rs.mElement_I8;
     }
 
+    /** @deprecated renderscript is deprecated in J
+     */
     public static Element U16(RenderScript rs) {
         if(rs.mElement_U16 == null) {
             rs.mElement_U16 = createUser(rs, DataType.UNSIGNED_16);
@@ -339,6 +345,8 @@
         return rs.mElement_U16;
     }
 
+    /** @deprecated renderscript is deprecated in J
+     */
     public static Element I16(RenderScript rs) {
         if(rs.mElement_I16 == null) {
             rs.mElement_I16 = createUser(rs, DataType.SIGNED_16);
@@ -346,6 +354,8 @@
         return rs.mElement_I16;
     }
 
+    /** @deprecated renderscript is deprecated in J
+     */
     public static Element U32(RenderScript rs) {
         if(rs.mElement_U32 == null) {
             rs.mElement_U32 = createUser(rs, DataType.UNSIGNED_32);
@@ -353,6 +363,8 @@
         return rs.mElement_U32;
     }
 
+    /** @deprecated renderscript is deprecated in J
+     */
     public static Element I32(RenderScript rs) {
         if(rs.mElement_I32 == null) {
             rs.mElement_I32 = createUser(rs, DataType.SIGNED_32);
@@ -360,6 +372,8 @@
         return rs.mElement_I32;
     }
 
+    /** @deprecated renderscript is deprecated in J
+     */
     public static Element U64(RenderScript rs) {
         if(rs.mElement_U64 == null) {
             rs.mElement_U64 = createUser(rs, DataType.UNSIGNED_64);
@@ -367,6 +381,8 @@
         return rs.mElement_U64;
     }
 
+    /** @deprecated renderscript is deprecated in J
+     */
     public static Element I64(RenderScript rs) {
         if(rs.mElement_I64 == null) {
             rs.mElement_I64 = createUser(rs, DataType.SIGNED_64);
@@ -374,6 +390,8 @@
         return rs.mElement_I64;
     }
 
+    /** @deprecated renderscript is deprecated in J
+     */
     public static Element F32(RenderScript rs) {
         if(rs.mElement_F32 == null) {
             rs.mElement_F32 = createUser(rs, DataType.FLOAT_32);
@@ -381,6 +399,8 @@
         return rs.mElement_F32;
     }
 
+    /** @deprecated renderscript is deprecated in J
+     */
     public static Element F64(RenderScript rs) {
         if(rs.mElement_F64 == null) {
             rs.mElement_F64 = createUser(rs, DataType.FLOAT_64);
@@ -388,6 +408,8 @@
         return rs.mElement_F64;
     }
 
+    /** @deprecated renderscript is deprecated in J
+     */
     public static Element ELEMENT(RenderScript rs) {
         if(rs.mElement_ELEMENT == null) {
             rs.mElement_ELEMENT = createUser(rs, DataType.RS_ELEMENT);
@@ -395,6 +417,8 @@
         return rs.mElement_ELEMENT;
     }
 
+    /** @deprecated renderscript is deprecated in J
+     */
     public static Element TYPE(RenderScript rs) {
         if(rs.mElement_TYPE == null) {
             rs.mElement_TYPE = createUser(rs, DataType.RS_TYPE);
@@ -402,6 +426,8 @@
         return rs.mElement_TYPE;
     }
 
+    /** @deprecated renderscript is deprecated in J
+     */
     public static Element ALLOCATION(RenderScript rs) {
         if(rs.mElement_ALLOCATION == null) {
             rs.mElement_ALLOCATION = createUser(rs, DataType.RS_ALLOCATION);
@@ -409,6 +435,8 @@
         return rs.mElement_ALLOCATION;
     }
 
+    /** @deprecated renderscript is deprecated in J
+     */
     public static Element SAMPLER(RenderScript rs) {
         if(rs.mElement_SAMPLER == null) {
             rs.mElement_SAMPLER = createUser(rs, DataType.RS_SAMPLER);
@@ -416,6 +444,8 @@
         return rs.mElement_SAMPLER;
     }
 
+    /** @deprecated renderscript is deprecated in J
+     */
     public static Element SCRIPT(RenderScript rs) {
         if(rs.mElement_SCRIPT == null) {
             rs.mElement_SCRIPT = createUser(rs, DataType.RS_SCRIPT);
@@ -423,6 +453,8 @@
         return rs.mElement_SCRIPT;
     }
 
+    /** @deprecated renderscript is deprecated in J
+     */
     public static Element MESH(RenderScript rs) {
         if(rs.mElement_MESH == null) {
             rs.mElement_MESH = createUser(rs, DataType.RS_MESH);
@@ -430,6 +462,8 @@
         return rs.mElement_MESH;
     }
 
+    /** @deprecated renderscript is deprecated in J
+     */
     public static Element PROGRAM_FRAGMENT(RenderScript rs) {
         if(rs.mElement_PROGRAM_FRAGMENT == null) {
             rs.mElement_PROGRAM_FRAGMENT = createUser(rs, DataType.RS_PROGRAM_FRAGMENT);
@@ -437,6 +471,8 @@
         return rs.mElement_PROGRAM_FRAGMENT;
     }
 
+    /** @deprecated renderscript is deprecated in J
+     */
     public static Element PROGRAM_VERTEX(RenderScript rs) {
         if(rs.mElement_PROGRAM_VERTEX == null) {
             rs.mElement_PROGRAM_VERTEX = createUser(rs, DataType.RS_PROGRAM_VERTEX);
@@ -444,6 +480,8 @@
         return rs.mElement_PROGRAM_VERTEX;
     }
 
+    /** @deprecated renderscript is deprecated in J
+     */
     public static Element PROGRAM_RASTER(RenderScript rs) {
         if(rs.mElement_PROGRAM_RASTER == null) {
             rs.mElement_PROGRAM_RASTER = createUser(rs, DataType.RS_PROGRAM_RASTER);
@@ -451,6 +489,8 @@
         return rs.mElement_PROGRAM_RASTER;
     }
 
+    /** @deprecated renderscript is deprecated in J
+     */
     public static Element PROGRAM_STORE(RenderScript rs) {
         if(rs.mElement_PROGRAM_STORE == null) {
             rs.mElement_PROGRAM_STORE = createUser(rs, DataType.RS_PROGRAM_STORE);
@@ -458,6 +498,8 @@
         return rs.mElement_PROGRAM_STORE;
     }
 
+    /** @hide
+        */
     public static Element FONT(RenderScript rs) {
         if(rs.mElement_FONT == null) {
             rs.mElement_FONT = createUser(rs, DataType.RS_FONT);
@@ -465,7 +507,8 @@
         return rs.mElement_FONT;
     }
 
-
+    /** @deprecated renderscript is deprecated in J
+     */
     public static Element A_8(RenderScript rs) {
         if(rs.mElement_A_8 == null) {
             rs.mElement_A_8 = createPixel(rs, DataType.UNSIGNED_8, DataKind.PIXEL_A);
@@ -473,6 +516,8 @@
         return rs.mElement_A_8;
     }
 
+    /** @deprecated renderscript is deprecated in J
+     */
     public static Element RGB_565(RenderScript rs) {
         if(rs.mElement_RGB_565 == null) {
             rs.mElement_RGB_565 = createPixel(rs, DataType.UNSIGNED_5_6_5, DataKind.PIXEL_RGB);
@@ -480,6 +525,8 @@
         return rs.mElement_RGB_565;
     }
 
+    /** @deprecated renderscript is deprecated in J
+     */
     public static Element RGB_888(RenderScript rs) {
         if(rs.mElement_RGB_888 == null) {
             rs.mElement_RGB_888 = createPixel(rs, DataType.UNSIGNED_8, DataKind.PIXEL_RGB);
@@ -487,6 +534,8 @@
         return rs.mElement_RGB_888;
     }
 
+    /** @deprecated renderscript is deprecated in J
+     */
     public static Element RGBA_5551(RenderScript rs) {
         if(rs.mElement_RGBA_5551 == null) {
             rs.mElement_RGBA_5551 = createPixel(rs, DataType.UNSIGNED_5_5_5_1, DataKind.PIXEL_RGBA);
@@ -494,6 +543,8 @@
         return rs.mElement_RGBA_5551;
     }
 
+    /** @deprecated renderscript is deprecated in J
+     */
     public static Element RGBA_4444(RenderScript rs) {
         if(rs.mElement_RGBA_4444 == null) {
             rs.mElement_RGBA_4444 = createPixel(rs, DataType.UNSIGNED_4_4_4_4, DataKind.PIXEL_RGBA);
@@ -501,6 +552,8 @@
         return rs.mElement_RGBA_4444;
     }
 
+    /** @deprecated renderscript is deprecated in J
+     */
     public static Element RGBA_8888(RenderScript rs) {
         if(rs.mElement_RGBA_8888 == null) {
             rs.mElement_RGBA_8888 = createPixel(rs, DataType.UNSIGNED_8, DataKind.PIXEL_RGBA);
@@ -508,6 +561,8 @@
         return rs.mElement_RGBA_8888;
     }
 
+    /** @deprecated renderscript is deprecated in J
+     */
     public static Element F32_2(RenderScript rs) {
         if(rs.mElement_FLOAT_2 == null) {
             rs.mElement_FLOAT_2 = createVector(rs, DataType.FLOAT_32, 2);
@@ -515,6 +570,8 @@
         return rs.mElement_FLOAT_2;
     }
 
+    /** @deprecated renderscript is deprecated in J
+     */
     public static Element F32_3(RenderScript rs) {
         if(rs.mElement_FLOAT_3 == null) {
             rs.mElement_FLOAT_3 = createVector(rs, DataType.FLOAT_32, 3);
@@ -522,6 +579,8 @@
         return rs.mElement_FLOAT_3;
     }
 
+    /** @deprecated renderscript is deprecated in J
+     */
     public static Element F32_4(RenderScript rs) {
         if(rs.mElement_FLOAT_4 == null) {
             rs.mElement_FLOAT_4 = createVector(rs, DataType.FLOAT_32, 4);
@@ -529,6 +588,8 @@
         return rs.mElement_FLOAT_4;
     }
 
+    /** @deprecated renderscript is deprecated in J
+     */
     public static Element F64_2(RenderScript rs) {
         if(rs.mElement_DOUBLE_2 == null) {
             rs.mElement_DOUBLE_2 = createVector(rs, DataType.FLOAT_64, 2);
@@ -536,6 +597,8 @@
         return rs.mElement_DOUBLE_2;
     }
 
+    /** @deprecated renderscript is deprecated in J
+     */
     public static Element F64_3(RenderScript rs) {
         if(rs.mElement_DOUBLE_3 == null) {
             rs.mElement_DOUBLE_3 = createVector(rs, DataType.FLOAT_64, 3);
@@ -543,6 +606,8 @@
         return rs.mElement_DOUBLE_3;
     }
 
+    /** @deprecated renderscript is deprecated in J
+     */
     public static Element F64_4(RenderScript rs) {
         if(rs.mElement_DOUBLE_4 == null) {
             rs.mElement_DOUBLE_4 = createVector(rs, DataType.FLOAT_64, 4);
@@ -550,6 +615,8 @@
         return rs.mElement_DOUBLE_4;
     }
 
+    /** @deprecated renderscript is deprecated in J
+     */
     public static Element U8_2(RenderScript rs) {
         if(rs.mElement_UCHAR_2 == null) {
             rs.mElement_UCHAR_2 = createVector(rs, DataType.UNSIGNED_8, 2);
@@ -557,6 +624,8 @@
         return rs.mElement_UCHAR_2;
     }
 
+    /** @deprecated renderscript is deprecated in J
+     */
     public static Element U8_3(RenderScript rs) {
         if(rs.mElement_UCHAR_3 == null) {
             rs.mElement_UCHAR_3 = createVector(rs, DataType.UNSIGNED_8, 3);
@@ -564,6 +633,8 @@
         return rs.mElement_UCHAR_3;
     }
 
+    /** @deprecated renderscript is deprecated in J
+     */
     public static Element U8_4(RenderScript rs) {
         if(rs.mElement_UCHAR_4 == null) {
             rs.mElement_UCHAR_4 = createVector(rs, DataType.UNSIGNED_8, 4);
@@ -571,6 +642,8 @@
         return rs.mElement_UCHAR_4;
     }
 
+    /** @deprecated renderscript is deprecated in J
+     */
     public static Element I8_2(RenderScript rs) {
         if(rs.mElement_CHAR_2 == null) {
             rs.mElement_CHAR_2 = createVector(rs, DataType.SIGNED_8, 2);
@@ -578,6 +651,8 @@
         return rs.mElement_CHAR_2;
     }
 
+    /** @deprecated renderscript is deprecated in J
+     */
     public static Element I8_3(RenderScript rs) {
         if(rs.mElement_CHAR_3 == null) {
             rs.mElement_CHAR_3 = createVector(rs, DataType.SIGNED_8, 3);
@@ -585,6 +660,8 @@
         return rs.mElement_CHAR_3;
     }
 
+    /** @deprecated renderscript is deprecated in J
+     */
     public static Element I8_4(RenderScript rs) {
         if(rs.mElement_CHAR_4 == null) {
             rs.mElement_CHAR_4 = createVector(rs, DataType.SIGNED_8, 4);
@@ -592,6 +669,8 @@
         return rs.mElement_CHAR_4;
     }
 
+    /** @deprecated renderscript is deprecated in J
+     */
     public static Element U16_2(RenderScript rs) {
         if(rs.mElement_USHORT_2 == null) {
             rs.mElement_USHORT_2 = createVector(rs, DataType.UNSIGNED_16, 2);
@@ -599,6 +678,8 @@
         return rs.mElement_USHORT_2;
     }
 
+    /** @deprecated renderscript is deprecated in J
+     */
     public static Element U16_3(RenderScript rs) {
         if(rs.mElement_USHORT_3 == null) {
             rs.mElement_USHORT_3 = createVector(rs, DataType.UNSIGNED_16, 3);
@@ -606,6 +687,8 @@
         return rs.mElement_USHORT_3;
     }
 
+    /** @deprecated renderscript is deprecated in J
+     */
     public static Element U16_4(RenderScript rs) {
         if(rs.mElement_USHORT_4 == null) {
             rs.mElement_USHORT_4 = createVector(rs, DataType.UNSIGNED_16, 4);
@@ -613,6 +696,8 @@
         return rs.mElement_USHORT_4;
     }
 
+    /** @deprecated renderscript is deprecated in J
+     */
     public static Element I16_2(RenderScript rs) {
         if(rs.mElement_SHORT_2 == null) {
             rs.mElement_SHORT_2 = createVector(rs, DataType.SIGNED_16, 2);
@@ -620,6 +705,8 @@
         return rs.mElement_SHORT_2;
     }
 
+    /** @deprecated renderscript is deprecated in J
+     */
     public static Element I16_3(RenderScript rs) {
         if(rs.mElement_SHORT_3 == null) {
             rs.mElement_SHORT_3 = createVector(rs, DataType.SIGNED_16, 3);
@@ -627,6 +714,8 @@
         return rs.mElement_SHORT_3;
     }
 
+    /** @deprecated renderscript is deprecated in J
+     */
     public static Element I16_4(RenderScript rs) {
         if(rs.mElement_SHORT_4 == null) {
             rs.mElement_SHORT_4 = createVector(rs, DataType.SIGNED_16, 4);
@@ -634,6 +723,8 @@
         return rs.mElement_SHORT_4;
     }
 
+    /** @deprecated renderscript is deprecated in J
+     */
     public static Element U32_2(RenderScript rs) {
         if(rs.mElement_UINT_2 == null) {
             rs.mElement_UINT_2 = createVector(rs, DataType.UNSIGNED_32, 2);
@@ -641,6 +732,8 @@
         return rs.mElement_UINT_2;
     }
 
+    /** @deprecated renderscript is deprecated in J
+     */
     public static Element U32_3(RenderScript rs) {
         if(rs.mElement_UINT_3 == null) {
             rs.mElement_UINT_3 = createVector(rs, DataType.UNSIGNED_32, 3);
@@ -648,6 +741,8 @@
         return rs.mElement_UINT_3;
     }
 
+    /** @deprecated renderscript is deprecated in J
+     */
     public static Element U32_4(RenderScript rs) {
         if(rs.mElement_UINT_4 == null) {
             rs.mElement_UINT_4 = createVector(rs, DataType.UNSIGNED_32, 4);
@@ -655,6 +750,8 @@
         return rs.mElement_UINT_4;
     }
 
+    /** @deprecated renderscript is deprecated in J
+     */
     public static Element I32_2(RenderScript rs) {
         if(rs.mElement_INT_2 == null) {
             rs.mElement_INT_2 = createVector(rs, DataType.SIGNED_32, 2);
@@ -662,6 +759,8 @@
         return rs.mElement_INT_2;
     }
 
+    /** @deprecated renderscript is deprecated in J
+     */
     public static Element I32_3(RenderScript rs) {
         if(rs.mElement_INT_3 == null) {
             rs.mElement_INT_3 = createVector(rs, DataType.SIGNED_32, 3);
@@ -669,6 +768,8 @@
         return rs.mElement_INT_3;
     }
 
+    /** @deprecated renderscript is deprecated in J
+     */
     public static Element I32_4(RenderScript rs) {
         if(rs.mElement_INT_4 == null) {
             rs.mElement_INT_4 = createVector(rs, DataType.SIGNED_32, 4);
@@ -676,6 +777,8 @@
         return rs.mElement_INT_4;
     }
 
+    /** @deprecated renderscript is deprecated in J
+     */
     public static Element U64_2(RenderScript rs) {
         if(rs.mElement_ULONG_2 == null) {
             rs.mElement_ULONG_2 = createVector(rs, DataType.UNSIGNED_64, 2);
@@ -683,6 +786,8 @@
         return rs.mElement_ULONG_2;
     }
 
+    /** @deprecated renderscript is deprecated in J
+     */
     public static Element U64_3(RenderScript rs) {
         if(rs.mElement_ULONG_3 == null) {
             rs.mElement_ULONG_3 = createVector(rs, DataType.UNSIGNED_64, 3);
@@ -690,6 +795,8 @@
         return rs.mElement_ULONG_3;
     }
 
+    /** @deprecated renderscript is deprecated in J
+     */
     public static Element U64_4(RenderScript rs) {
         if(rs.mElement_ULONG_4 == null) {
             rs.mElement_ULONG_4 = createVector(rs, DataType.UNSIGNED_64, 4);
@@ -697,6 +804,8 @@
         return rs.mElement_ULONG_4;
     }
 
+    /** @deprecated renderscript is deprecated in J
+     */
     public static Element I64_2(RenderScript rs) {
         if(rs.mElement_LONG_2 == null) {
             rs.mElement_LONG_2 = createVector(rs, DataType.SIGNED_64, 2);
@@ -704,6 +813,8 @@
         return rs.mElement_LONG_2;
     }
 
+    /** @deprecated renderscript is deprecated in J
+     */
     public static Element I64_3(RenderScript rs) {
         if(rs.mElement_LONG_3 == null) {
             rs.mElement_LONG_3 = createVector(rs, DataType.SIGNED_64, 3);
@@ -711,6 +822,8 @@
         return rs.mElement_LONG_3;
     }
 
+    /** @deprecated renderscript is deprecated in J
+     */
     public static Element I64_4(RenderScript rs) {
         if(rs.mElement_LONG_4 == null) {
             rs.mElement_LONG_4 = createVector(rs, DataType.SIGNED_64, 4);
@@ -718,16 +831,22 @@
         return rs.mElement_LONG_4;
     }
 
+    /** @deprecated renderscript is deprecated in J
+     */
     public static Element MATRIX_4X4(RenderScript rs) {
         if(rs.mElement_MATRIX_4X4 == null) {
             rs.mElement_MATRIX_4X4 = createUser(rs, DataType.MATRIX_4X4);
         }
         return rs.mElement_MATRIX_4X4;
     }
+    /** @deprecated renderscript is deprecated in J
+     */
     public static Element MATRIX4X4(RenderScript rs) {
         return MATRIX_4X4(rs);
     }
 
+    /** @deprecated renderscript is deprecated in J
+     */
     public static Element MATRIX_3X3(RenderScript rs) {
         if(rs.mElement_MATRIX_3X3 == null) {
             rs.mElement_MATRIX_3X3 = createUser(rs, DataType.MATRIX_3X3);
@@ -735,6 +854,8 @@
         return rs.mElement_MATRIX_3X3;
     }
 
+    /** @deprecated renderscript is deprecated in J
+     */
     public static Element MATRIX_2X2(RenderScript rs) {
         if(rs.mElement_MATRIX_2X2 == null) {
             rs.mElement_MATRIX_2X2 = createUser(rs, DataType.MATRIX_2X2);
@@ -824,7 +945,7 @@
         updateVisibleSubElements();
     }
 
-    /**
+    /** @deprecated renderscript is deprecated in J
      * Create a custom Element of the specified DataType.  The DataKind will be
      * set to USER and the vector size to 1 indicating non-vector.
      *
@@ -840,7 +961,7 @@
         return new Element(id, rs, dt, dk, norm, vecSize);
     }
 
-    /**
+    /** @deprecated renderscript is deprecated in J
      * Create a custom vector element of the specified DataType and vector size.
      * DataKind will be set to USER. Only primitive types (FLOAT_32, FLOAT_64,
      * SIGNED_8, SIGNED_16, SIGNED_32, SIGNED_64, UNSIGNED_8, UNSIGNED_16,
@@ -884,7 +1005,7 @@
         }
     }
 
-    /**
+    /** @deprecated renderscript is deprecated in J
      * Create a new pixel Element type.  A matching DataType and DataKind must
      * be provided.  The DataType and DataKind must contain the same number of
      * components.  Vector size will be set to 1.
@@ -947,7 +1068,7 @@
         return new Element(id, rs, dt, dk, norm, size);
     }
 
-    /**
+    /** @deprecated renderscript is deprecated in J
      * Check if the current Element is compatible with another Element.
      * Primitive Elements are compatible if they share the same underlying
      * size and type (i.e. U8 is compatible with A_8). User-defined Elements
@@ -974,7 +1095,7 @@
                 (mVectorSize == e.mVectorSize));
     }
 
-    /**
+    /** @deprecated renderscript is deprecated in J
      * Builder class for producing complex elements with matching field and name
      * pairs.  The builder starts empty.  The order in which elements are added
      * is retained for the layout in memory.
@@ -988,7 +1109,7 @@
         int mCount;
         int mSkipPadding;
 
-        /**
+        /** @deprecated renderscript is deprecated in J
          * Create a builder object.
          *
          * @param rs
@@ -1001,7 +1122,7 @@
             mArraySizes = new int[8];
         }
 
-        /**
+        /** @deprecated renderscript is deprecated in J
          * Add an array of elements to this element.
          *
          * @param element
@@ -1045,7 +1166,7 @@
             return this;
         }
 
-        /**
+        /** @deprecated renderscript is deprecated in J
          * Add a single element to this Element.
          *
          * @param element
@@ -1055,7 +1176,7 @@
             return add(element, name, 1);
         }
 
-        /**
+        /** @deprecated renderscript is deprecated in J
          * Create the element from this builder.
          *
          *
diff --git a/graphics/java/android/renderscript/FieldPacker.java b/graphics/java/android/renderscript/FieldPacker.java
index a215a57..9d36e33 100644
--- a/graphics/java/android/renderscript/FieldPacker.java
+++ b/graphics/java/android/renderscript/FieldPacker.java
@@ -17,7 +17,7 @@
 package android.renderscript;
 
 
-/**
+/** @deprecated renderscript is deprecated in J
  * Utility class for packing arguments and structures from Android system objects to
  * Renderscript objects.
  *
diff --git a/graphics/java/android/renderscript/FileA3D.java b/graphics/java/android/renderscript/FileA3D.java
index 61793171..1158061 100644
--- a/graphics/java/android/renderscript/FileA3D.java
+++ b/graphics/java/android/renderscript/FileA3D.java
@@ -27,7 +27,7 @@
 import android.util.Log;
 import android.util.TypedValue;
 
-/**
+/** @deprecated renderscript is deprecated in J
  * FileA3D allows users to load Renderscript objects from files
  * or resources stored on disk. It could be used to load items
  * such as 3D geometry data converted to a Renderscript format from
@@ -40,17 +40,17 @@
  **/
 public class FileA3D extends BaseObj {
 
-    /**
+    /** @deprecated renderscript is deprecated in J
     * Specifies what renderscript object type is contained within
     * the FileA3D IndexEntry
     **/
     public enum EntryType {
 
-        /**
+        /** @deprecated renderscript is deprecated in J
         * Unknown or or invalid object, nothing will be loaded
         **/
         UNKNOWN (0),
-        /**
+        /** @deprecated renderscript is deprecated in J
         * Renderscript Mesh object
         **/
         MESH (1);
@@ -65,7 +65,7 @@
         }
     }
 
-    /**
+    /** @deprecated renderscript is deprecated in J
     * IndexEntry contains information about one of the Renderscript
     * objects inside the file's index. It could be used to query the
     * object's type and also name and load the object itself if
@@ -79,7 +79,7 @@
         EntryType mEntryType;
         BaseObj mLoadedObj;
 
-        /**
+        /** @deprecated renderscript is deprecated in J
         * Returns the name of a renderscript object the index entry
         * describes
         *
@@ -91,7 +91,7 @@
             return mName;
         }
 
-        /**
+        /** @deprecated renderscript is deprecated in J
         * Returns the type of a renderscript object the index entry
         * describes
         * @return type of a renderscript object the index entry
@@ -101,7 +101,7 @@
             return mEntryType;
         }
 
-        /**
+        /** @deprecated renderscript is deprecated in J
         * Used to load the object described by the index entry
         * @return base renderscript object described by the entry
         */
@@ -111,7 +111,7 @@
             return obj;
         }
 
-        /**
+        /** @deprecated renderscript is deprecated in J
         * Used to load the mesh described by the index entry, object
         * described by the index entry must be a renderscript mesh
         *
@@ -181,7 +181,7 @@
         }
     }
 
-    /**
+    /** @deprecated renderscript is deprecated in J
     * Returns the number of objects stored inside the a3d file
     *
     * @return the number of objects stored inside the a3d file
@@ -193,7 +193,7 @@
         return mFileEntries.length;
     }
 
-    /**
+    /** @deprecated renderscript is deprecated in J
     * Returns an index entry from the list of all objects inside
     * FileA3D
     *
@@ -208,7 +208,7 @@
         return mFileEntries[index];
     }
 
-    /**
+    /** @deprecated renderscript is deprecated in J
     * Creates a FileA3D object from an asset stored on disk
     *
     * @param rs Context to which the object will belong.
@@ -229,7 +229,7 @@
         return fa3d;
     }
 
-    /**
+    /** @deprecated renderscript is deprecated in J
     * Creates a FileA3D object from a file stored on disk
     *
     * @param rs Context to which the object will belong.
@@ -248,7 +248,7 @@
         return fa3d;
     }
 
-    /**
+    /** @deprecated renderscript is deprecated in J
     * Creates a FileA3D object from a file stored on disk
     *
     * @param rs Context to which the object will belong.
@@ -260,7 +260,7 @@
         return createFromFile(rs, path.getAbsolutePath());
     }
 
-    /**
+    /** @deprecated renderscript is deprecated in J
     * Creates a FileA3D object from an application resource
     *
     * @param rs Context to which the object will belong.
diff --git a/graphics/java/android/renderscript/Float2.java b/graphics/java/android/renderscript/Float2.java
index 1d4ce36..a89a5df 100644
--- a/graphics/java/android/renderscript/Float2.java
+++ b/graphics/java/android/renderscript/Float2.java
@@ -20,7 +20,7 @@
 import android.util.Log;
 
 
-/**
+/** @deprecated renderscript is deprecated in J
  * Class for exposing the native Renderscript float2 type back to the Android system.
  *
  **/
diff --git a/graphics/java/android/renderscript/Float3.java b/graphics/java/android/renderscript/Float3.java
index ffd1135..909a897 100644
--- a/graphics/java/android/renderscript/Float3.java
+++ b/graphics/java/android/renderscript/Float3.java
@@ -20,7 +20,7 @@
 import android.util.Log;
 
 
-/**
+/** @deprecated renderscript is deprecated in J
  * Class for exposing the native Renderscript float2 type back to the Android system.
  *
  **/
diff --git a/graphics/java/android/renderscript/Float4.java b/graphics/java/android/renderscript/Float4.java
index c7cc3ae..3be6dbc 100644
--- a/graphics/java/android/renderscript/Float4.java
+++ b/graphics/java/android/renderscript/Float4.java
@@ -20,7 +20,7 @@
 import android.util.Log;
 
 
-/**
+/** @deprecated renderscript is deprecated in J
  * Class for exposing the native Renderscript float2 type back to the Android system.
  *
  **/
diff --git a/graphics/java/android/renderscript/Font.java b/graphics/java/android/renderscript/Font.java
index 18dacac..cd1010c 100644
--- a/graphics/java/android/renderscript/Font.java
+++ b/graphics/java/android/renderscript/Font.java
@@ -29,8 +29,8 @@
 import android.util.Log;
 import android.util.TypedValue;
 
-/**
- * <p>This class gives users a simple way to draw hardware accelerated text. 
+/** @deprecated renderscript is deprecated in J
+ * <p>This class gives users a simple way to draw hardware accelerated text.
  * Internally, the glyphs are rendered using the Freetype library and an internal cache of
  * rendered glyph bitmaps is maintained. Each font object represents a combination of a typeface,
  * and point size. You can create multiple font objects to represent styles such as bold or italic text,
@@ -42,7 +42,7 @@
  * render large batches of text in sequence. It is also more efficient to render multiple
  * characters at once instead of one by one to improve draw call batching.</p>
  * <p>Font color and transparency are not part of the font object and you can freely modify
- * them in the script to suit the user's rendering needs. Font colors work as a state machine. 
+ * them in the script to suit the user's rendering needs. Font colors work as a state machine.
  * Every new call to draw text uses the last color set in the script.</p>
  **/
 public class Font extends BaseObj {
@@ -71,10 +71,20 @@
 
     private static Map<String, FontFamily> sFontFamilyMap;
 
+    /** @deprecated renderscript is deprecated in J
+     */
     public enum Style {
+        /** @deprecated renderscript is deprecated in J
+        */
         NORMAL,
+        /** @deprecated renderscript is deprecated in J
+        */
         BOLD,
+        /** @deprecated renderscript is deprecated in J
+        */
         ITALIC,
+        /** @deprecated renderscript is deprecated in J
+        */
         BOLD_ITALIC;
     }
 
@@ -138,7 +148,7 @@
         super(id, rs);
     }
 
-    /**
+    /** @deprecated renderscript is deprecated in J
      * Takes a specific file name as an argument
      */
     static public Font createFromFile(RenderScript rs, Resources res, String path, float pointSize) {
@@ -154,10 +164,14 @@
         return rsFont;
     }
 
+    /** @deprecated renderscript is deprecated in J
+     */
     static public Font createFromFile(RenderScript rs, Resources res, File path, float pointSize) {
         return createFromFile(rs, res, path.getAbsolutePath(), pointSize);
     }
 
+    /** @deprecated renderscript is deprecated in J
+     */
     static public Font createFromAsset(RenderScript rs, Resources res, String path, float pointSize) {
         rs.validate();
         AssetManager mgr = res.getAssets();
@@ -171,6 +185,8 @@
         return rsFont;
     }
 
+    /** @deprecated renderscript is deprecated in J
+     */
     static public Font createFromResource(RenderScript rs, Resources res, int id, float pointSize) {
         String name = "R." + Integer.toString(id);
 
@@ -199,7 +215,7 @@
         return rsFont;
     }
 
-    /**
+    /** @deprecated renderscript is deprecated in J
      * Accepts one of the following family names as an argument
      * and will attempt to produce the best match with a system font:
      *
diff --git a/graphics/java/android/renderscript/Int2.java b/graphics/java/android/renderscript/Int2.java
index 434af21..4e2d344 100644
--- a/graphics/java/android/renderscript/Int2.java
+++ b/graphics/java/android/renderscript/Int2.java
@@ -20,7 +20,7 @@
 import android.util.Log;
 
 
-/**
+/** @deprecated renderscript is deprecated in J
  * Class for exposing the native Renderscript int2 type back to the Android system.
  *
  **/
diff --git a/graphics/java/android/renderscript/Int3.java b/graphics/java/android/renderscript/Int3.java
index 333ccf8..1ffc129 100644
--- a/graphics/java/android/renderscript/Int3.java
+++ b/graphics/java/android/renderscript/Int3.java
@@ -20,7 +20,7 @@
 import android.util.Log;
 
 
-/**
+/** @deprecated renderscript is deprecated in J
  * Class for exposing the native Renderscript int3 type back to the Android system.
  *
  **/
diff --git a/graphics/java/android/renderscript/Int4.java b/graphics/java/android/renderscript/Int4.java
index 8734c95..555d431 100644
--- a/graphics/java/android/renderscript/Int4.java
+++ b/graphics/java/android/renderscript/Int4.java
@@ -20,7 +20,7 @@
 import android.util.Log;
 
 
-/**
+/** @deprecated renderscript is deprecated in J
  * Class for exposing the native Renderscript int4 type back to the Android system.
  *
  **/
diff --git a/graphics/java/android/renderscript/Long2.java b/graphics/java/android/renderscript/Long2.java
index 95ea18c..aad6bd6 100644
--- a/graphics/java/android/renderscript/Long2.java
+++ b/graphics/java/android/renderscript/Long2.java
@@ -20,7 +20,7 @@
 import android.util.Log;
 
 
-/**
+/** @deprecated renderscript is deprecated in J
  * Class for exposing the native Renderscript long2 type back to the Android system.
  **/
 public class Long2 {
diff --git a/graphics/java/android/renderscript/Long3.java b/graphics/java/android/renderscript/Long3.java
index 96ee885..9c03d5c 100644
--- a/graphics/java/android/renderscript/Long3.java
+++ b/graphics/java/android/renderscript/Long3.java
@@ -20,7 +20,7 @@
 import android.util.Log;
 
 
-/**
+/** @deprecated renderscript is deprecated in J
  * Class for exposing the native Renderscript long3 type back to the Android system.
  **/
 public class Long3 {
diff --git a/graphics/java/android/renderscript/Long4.java b/graphics/java/android/renderscript/Long4.java
index 50e664c..6611cdf 100644
--- a/graphics/java/android/renderscript/Long4.java
+++ b/graphics/java/android/renderscript/Long4.java
@@ -20,7 +20,7 @@
 import android.util.Log;
 
 
-/**
+/** @deprecated renderscript is deprecated in J
  * Class for exposing the native Renderscript long4 type back to the Android system.
  **/
 public class Long4 {
diff --git a/graphics/java/android/renderscript/Matrix2f.java b/graphics/java/android/renderscript/Matrix2f.java
index acc5bd8..38b5316 100644
--- a/graphics/java/android/renderscript/Matrix2f.java
+++ b/graphics/java/android/renderscript/Matrix2f.java
@@ -20,13 +20,13 @@
 import android.util.Log;
 
 
-/**
+/** @deprecated renderscript is deprecated in J
  * Class for exposing the native Renderscript rs_matrix2x2 type back to the Android system.
  *
  **/
 public class Matrix2f {
 
-    /**
+    /** @deprecated renderscript is deprecated in J
     * Creates a new identity 2x2 matrix
     */
     public Matrix2f() {
@@ -34,7 +34,7 @@
         loadIdentity();
     }
 
-    /**
+    /** @deprecated renderscript is deprecated in J
     * Creates a new matrix and sets its values from the given
     * parameter
     *
@@ -46,7 +46,7 @@
         System.arraycopy(dataArray, 0, mMat, 0, mMat.length);
     }
 
-    /**
+    /** @deprecated renderscript is deprecated in J
     * Return a reference to the internal array representing matrix
     * values. Modifying this array will also change the matrix
     *
@@ -56,7 +56,7 @@
         return mMat;
     }
 
-    /**
+    /** @deprecated renderscript is deprecated in J
     * Returns the value for a given row and column
     *
     * @param i row of the value to return
@@ -68,7 +68,7 @@
         return mMat[i*2 + j];
     }
 
-    /**
+    /** @deprecated renderscript is deprecated in J
     * Sets the value for a given row and column
     *
     * @param i row of the value to set
@@ -78,7 +78,7 @@
         mMat[i*2 + j] = v;
     }
 
-    /**
+    /** @deprecated renderscript is deprecated in J
     * Sets the matrix values to identity
     */
     public void loadIdentity() {
@@ -89,7 +89,7 @@
         mMat[3] = 1;
     }
 
-    /**
+    /** @deprecated renderscript is deprecated in J
     * Sets the values of the matrix to those of the parameter
     *
     * @param src matrix to load the values from
@@ -98,7 +98,7 @@
         System.arraycopy(src.getArray(), 0, mMat, 0, mMat.length);
     }
 
-    /**
+    /** @deprecated renderscript is deprecated in J
     * Sets current values to be a rotation matrix of given angle
     *
     * @param rot rotation angle
@@ -114,7 +114,7 @@
         mMat[3] = c;
     }
 
-    /**
+    /** @deprecated renderscript is deprecated in J
     * Sets current values to be a scale matrix of given dimensions
     *
     * @param x scale component x
@@ -126,7 +126,7 @@
         mMat[3] = y;
     }
 
-    /**
+    /** @deprecated renderscript is deprecated in J
     * Sets current values to be the result of multiplying two given
     * matrices
     *
@@ -147,7 +147,7 @@
         }
     }
 
-    /**
+    /** @deprecated renderscript is deprecated in J
     * Post-multiplies the current matrix by a given parameter
     *
     * @param rhs right hand side to multiply by
@@ -157,7 +157,7 @@
         tmp.loadMultiply(this, rhs);
         load(tmp);
     }
-    /**
+    /** @deprecated renderscript is deprecated in J
     * Modifies the current matrix by post-multiplying it with a
     * rotation matrix of given angle
     *
@@ -168,7 +168,7 @@
         tmp.loadRotate(rot);
         multiply(tmp);
     }
-    /**
+    /** @deprecated renderscript is deprecated in J
     * Modifies the current matrix by post-multiplying it with a
     * scale matrix of given dimensions
     *
@@ -180,7 +180,7 @@
         tmp.loadScale(x, y);
         multiply(tmp);
     }
-    /**
+    /** @deprecated renderscript is deprecated in J
     * Sets the current matrix to its transpose
     */
     public void transpose() {
diff --git a/graphics/java/android/renderscript/Matrix3f.java b/graphics/java/android/renderscript/Matrix3f.java
index 253506d..b821742 100644
--- a/graphics/java/android/renderscript/Matrix3f.java
+++ b/graphics/java/android/renderscript/Matrix3f.java
@@ -20,13 +20,13 @@
 import android.util.Log;
 
 
-/**
+/** @deprecated renderscript is deprecated in J
  * Class for exposing the native Renderscript rs_matrix3x3 type back to the Android system.
  *
  **/
 public class Matrix3f {
 
-    /**
+    /** @deprecated renderscript is deprecated in J
     * Creates a new identity 3x3 matrix
     */
     public Matrix3f() {
@@ -34,7 +34,7 @@
         loadIdentity();
     }
 
-    /**
+    /** @deprecated renderscript is deprecated in J
     * Creates a new matrix and sets its values from the given
     * parameter
     *
@@ -46,7 +46,7 @@
         System.arraycopy(dataArray, 0, mMat, 0, mMat.length);
     }
 
-    /**
+    /** @deprecated renderscript is deprecated in J
     * Return a reference to the internal array representing matrix
     * values. Modifying this array will also change the matrix
     *
@@ -56,7 +56,7 @@
         return mMat;
     }
 
-    /**
+    /** @deprecated renderscript is deprecated in J
     * Returns the value for a given row and column
     *
     * @param i row of the value to return
@@ -68,7 +68,7 @@
         return mMat[i*3 + j];
     }
 
-    /**
+    /** @deprecated renderscript is deprecated in J
     * Sets the value for a given row and column
     *
     * @param i row of the value to set
@@ -78,7 +78,7 @@
         mMat[i*3 + j] = v;
     }
 
-    /**
+    /** @deprecated renderscript is deprecated in J
     * Sets the matrix values to identity
     */
     public void loadIdentity() {
@@ -95,7 +95,7 @@
         mMat[8] = 1;
     }
 
-    /**
+    /** @deprecated renderscript is deprecated in J
     * Sets the values of the matrix to those of the parameter
     *
     * @param src matrix to load the values from
@@ -104,7 +104,7 @@
         System.arraycopy(src.getArray(), 0, mMat, 0, mMat.length);
     }
 
-    /**
+    /** @deprecated renderscript is deprecated in J
     * Sets current values to be a rotation matrix of certain angle
     * about a given axis
     *
@@ -144,7 +144,7 @@
         mMat[8] = z*z*nc +  c;
     }
 
-    /**
+    /** @deprecated renderscript is deprecated in J
     * Makes the upper 2x2 a rotation matrix of the given angle
     *
     * @param rot rotation angle
@@ -161,7 +161,7 @@
         mMat[4] = c;
     }
 
-    /**
+    /** @deprecated renderscript is deprecated in J
     * Makes the upper 2x2 a scale matrix of given dimensions
     *
     * @param x scale component x
@@ -173,7 +173,7 @@
         mMat[4] = y;
     }
 
-    /**
+    /** @deprecated renderscript is deprecated in J
     * Sets current values to be a scale matrix of given dimensions
     *
     * @param x scale component x
@@ -187,7 +187,7 @@
         mMat[8] = z;
     }
 
-    /**
+    /** @deprecated renderscript is deprecated in J
     * Sets current values to be a translation matrix of given
     * dimensions
     *
@@ -200,7 +200,7 @@
         mMat[7] = y;
     }
 
-    /**
+    /** @deprecated renderscript is deprecated in J
     * Sets current values to be the result of multiplying two given
     * matrices
     *
@@ -224,7 +224,7 @@
         }
     }
 
-    /**
+    /** @deprecated renderscript is deprecated in J
     * Post-multiplies the current matrix by a given parameter
     *
     * @param rhs right hand side to multiply by
@@ -235,7 +235,7 @@
         load(tmp);
     }
 
-    /**
+    /** @deprecated renderscript is deprecated in J
     * Modifies the current matrix by post-multiplying it with a
     * rotation matrix of certain angle about a given axis
     *
@@ -250,7 +250,7 @@
         multiply(tmp);
     }
 
-    /**
+    /** @deprecated renderscript is deprecated in J
     * Modifies the upper 2x2 of the current matrix by
     * post-multiplying it with a rotation matrix of given angle
     *
@@ -262,7 +262,7 @@
         multiply(tmp);
     }
 
-    /**
+    /** @deprecated renderscript is deprecated in J
     * Modifies the upper 2x2 of the current matrix by
     * post-multiplying it with a scale matrix of given dimensions
     *
@@ -275,7 +275,7 @@
         multiply(tmp);
     }
 
-    /**
+    /** @deprecated renderscript is deprecated in J
     * Modifies the current matrix by post-multiplying it with a
     * scale matrix of given dimensions
     *
@@ -289,7 +289,7 @@
         multiply(tmp);
     }
 
-    /**
+    /** @deprecated renderscript is deprecated in J
     * Modifies the current matrix by post-multiplying it with a
     * translation matrix of given dimensions
     *
@@ -302,7 +302,7 @@
         multiply(tmp);
     }
 
-    /**
+    /** @deprecated renderscript is deprecated in J
     * Sets the current matrix to its transpose
     */
     public void transpose() {
diff --git a/graphics/java/android/renderscript/Matrix4f.java b/graphics/java/android/renderscript/Matrix4f.java
index adc1806..8b7a0df 100644
--- a/graphics/java/android/renderscript/Matrix4f.java
+++ b/graphics/java/android/renderscript/Matrix4f.java
@@ -20,13 +20,13 @@
 import android.util.Log;
 
 
-/**
+/** @deprecated renderscript is deprecated in J
  * Class for exposing the native Renderscript rs_matrix4x4 type back to the Android system.
  *
  **/
 public class Matrix4f {
 
-    /**
+    /** @deprecated renderscript is deprecated in J
     * Creates a new identity 4x4 matrix
     */
     public Matrix4f() {
@@ -34,7 +34,7 @@
         loadIdentity();
     }
 
-    /**
+    /** @deprecated renderscript is deprecated in J
     * Creates a new matrix and sets its values from the given
     * parameter
     *
@@ -46,7 +46,7 @@
         System.arraycopy(dataArray, 0, mMat, 0, mMat.length);
     }
 
-    /**
+    /** @deprecated renderscript is deprecated in J
     * Return a reference to the internal array representing matrix
     * values. Modifying this array will also change the matrix
     *
@@ -56,7 +56,7 @@
         return mMat;
     }
 
-    /**
+    /** @deprecated renderscript is deprecated in J
     * Returns the value for a given row and column
     *
     * @param i row of the value to return
@@ -68,7 +68,7 @@
         return mMat[i*4 + j];
     }
 
-    /**
+    /** @deprecated renderscript is deprecated in J
     * Sets the value for a given row and column
     *
     * @param i row of the value to set
@@ -78,7 +78,7 @@
         mMat[i*4 + j] = v;
     }
 
-    /**
+    /** @deprecated renderscript is deprecated in J
     * Sets the matrix values to identity
     */
     public void loadIdentity() {
@@ -103,7 +103,7 @@
         mMat[15] = 1;
     }
 
-    /**
+    /** @deprecated renderscript is deprecated in J
     * Sets the values of the matrix to those of the parameter
     *
     * @param src matrix to load the values from
@@ -112,7 +112,7 @@
         System.arraycopy(src.getArray(), 0, mMat, 0, mMat.length);
     }
 
-    /**
+    /** @deprecated renderscript is deprecated in J
     * Sets current values to be a rotation matrix of certain angle
     * about a given axis
     *
@@ -159,7 +159,7 @@
         mMat[10] = z*z*nc +  c;
     }
 
-    /**
+    /** @deprecated renderscript is deprecated in J
     * Sets current values to be a scale matrix of given dimensions
     *
     * @param x scale component x
@@ -173,7 +173,7 @@
         mMat[10] = z;
     }
 
-    /**
+    /** @deprecated renderscript is deprecated in J
     * Sets current values to be a translation matrix of given
     * dimensions
     *
@@ -188,7 +188,7 @@
         mMat[14] = z;
     }
 
-    /**
+    /** @deprecated renderscript is deprecated in J
     * Sets current values to be the result of multiplying two given
     * matrices
     *
@@ -215,7 +215,7 @@
         }
     }
 
-    /**
+    /** @deprecated renderscript is deprecated in J
     * Set current values to be an orthographic projection matrix
     *
     * @param l location of the left vertical clipping plane
@@ -235,7 +235,7 @@
         mMat[14]= -(f + n) / (f - n);
     }
 
-    /**
+    /** @deprecated renderscript is deprecated in J
     * Set current values to be an orthographic projection matrix
     * with the right and bottom clipping planes set to the given
     * values. Left and top clipping planes are set to 0. Near and
@@ -249,7 +249,7 @@
         loadOrtho(0,w, h,0, -1,1);
     }
 
-    /**
+    /** @deprecated renderscript is deprecated in J
     * Sets current values to be a perspective projection matrix
     *
     * @param l location of the left vertical clipping plane
@@ -272,7 +272,7 @@
         mMat[15]= 0;
     }
 
-    /**
+    /** @deprecated renderscript is deprecated in J
     * Sets current values to be a perspective projection matrix
     *
     * @param fovy vertical field of view angle in degrees
@@ -288,7 +288,7 @@
         loadFrustum(left, right, bottom, top, near, far);
     }
 
-    /**
+    /** @deprecated renderscript is deprecated in J
     * Helper function to set the current values to a perspective
     * projection matrix with aspect ratio defined by the parameters
     * and (near, far), (bottom, top) mapping to (-1, 1) at z = 0
@@ -321,7 +321,7 @@
         load(m1);
     }
 
-    /**
+    /** @deprecated renderscript is deprecated in J
     * Post-multiplies the current matrix by a given parameter
     *
     * @param rhs right hand side to multiply by
@@ -331,7 +331,7 @@
         tmp.loadMultiply(this, rhs);
         load(tmp);
     }
-    /**
+    /** @deprecated renderscript is deprecated in J
     * Modifies the current matrix by post-multiplying it with a
     * rotation matrix of certain angle about a given axis
     *
@@ -346,7 +346,7 @@
         multiply(tmp);
     }
 
-    /**
+    /** @deprecated renderscript is deprecated in J
     * Modifies the current matrix by post-multiplying it with a
     * scale matrix of given dimensions
     *
@@ -360,7 +360,7 @@
         multiply(tmp);
     }
 
-    /**
+    /** @deprecated renderscript is deprecated in J
     * Modifies the current matrix by post-multiplying it with a
     * translation matrix of given dimensions
     *
@@ -392,7 +392,7 @@
         return cofactor;
     }
 
-    /**
+    /** @deprecated renderscript is deprecated in J
     * Sets the current matrix to its inverse
     */
     public boolean inverse() {
@@ -421,7 +421,7 @@
         return true;
     }
 
-    /**
+    /** @deprecated renderscript is deprecated in J
     * Sets the current matrix to its inverse transpose
     */
     public boolean inverseTranspose() {
@@ -449,7 +449,7 @@
         return true;
     }
 
-    /**
+    /** @deprecated renderscript is deprecated in J
     * Sets the current matrix to its transpose
     */
     public void transpose() {
diff --git a/graphics/java/android/renderscript/Mesh.java b/graphics/java/android/renderscript/Mesh.java
index ffbb41d..bc32038 100644
--- a/graphics/java/android/renderscript/Mesh.java
+++ b/graphics/java/android/renderscript/Mesh.java
@@ -20,7 +20,7 @@
 
 import android.util.Log;
 
-/**
+/** @deprecated renderscript is deprecated in J
  * <p>This class is a container for geometric data displayed with
  * Renderscript. Internally, a mesh is a collection of allocations that
  * represent vertex data (positions, normals, texture
@@ -39,34 +39,34 @@
  **/
 public class Mesh extends BaseObj {
 
-    /**
+    /** @deprecated renderscript is deprecated in J
     * Describes the way mesh vertex data is interpreted when rendering
     *
     **/
     public enum Primitive {
-        /**
+        /** @deprecated renderscript is deprecated in J
         * Vertex data will be rendered as a series of points
         */
         POINT (0),
-        /**
+        /** @deprecated renderscript is deprecated in J
         * Vertex pairs will be rendered as lines
         */
         LINE (1),
-        /**
+        /** @deprecated renderscript is deprecated in J
         * Vertex data will be rendered as a connected line strip
         */
         LINE_STRIP (2),
-        /**
+        /** @deprecated renderscript is deprecated in J
         * Vertices will be rendered as individual triangles
         */
         TRIANGLE (3),
-        /**
+        /** @deprecated renderscript is deprecated in J
         * Vertices will be rendered as a connected triangle strip
         * defined by the first three vertices with each additional
         * triangle defined by a new vertex
         */
         TRIANGLE_STRIP (4),
-        /**
+        /** @deprecated renderscript is deprecated in J
         * Vertices will be rendered as a sequence of triangles that all
         * share first vertex as the origin
         */
@@ -86,7 +86,7 @@
         super(id, rs);
     }
 
-    /**
+    /** @deprecated renderscript is deprecated in J
     * @return number of allocations containing vertex data
     *
     **/
@@ -96,7 +96,7 @@
         }
         return mVertexBuffers.length;
     }
-    /**
+    /** @deprecated renderscript is deprecated in J
     * @param slot index in the list of allocations to return
     * @return vertex data allocation at the given index
     *
@@ -105,7 +105,7 @@
         return mVertexBuffers[slot];
     }
 
-    /**
+    /** @deprecated renderscript is deprecated in J
     * @return number of primitives or index sets in the mesh
     *
     **/
@@ -116,7 +116,7 @@
         return mIndexBuffers.length;
     }
 
-    /**
+    /** @deprecated renderscript is deprecated in J
     * @param slot locaton within the list of index set allocation
     * @return allocation containing primtive index data or null if
     *         the index data is not specified explicitly
@@ -125,7 +125,7 @@
     public Allocation getIndexSetAllocation(int slot) {
         return mIndexBuffers[slot];
     }
-    /**
+    /** @deprecated renderscript is deprecated in J
     * @param slot locaiton within the list of index set primitives
     * @return index set primitive type
     *
@@ -167,7 +167,7 @@
         }
     }
 
-    /**
+    /** @deprecated renderscript is deprecated in J
     * Mesh builder object. It starts empty and requires you to
     * add the types necessary to create vertex and index
     * allocations.
@@ -189,7 +189,7 @@
         Entry[] mVertexTypes;
         Vector mIndexTypes;
 
-        /**
+        /** @deprecated renderscript is deprecated in J
         * Creates builder object
         * @param rs Context to which the mesh will belong.
         * @param usage specifies how the mesh allocations are to be
@@ -204,7 +204,7 @@
             mIndexTypes = new Vector();
         }
 
-        /**
+        /** @deprecated renderscript is deprecated in J
         * @return internal index of the last vertex buffer type added to
         *         builder
         **/
@@ -212,7 +212,7 @@
             return mVertexTypeCount - 1;
         }
 
-        /**
+        /** @deprecated renderscript is deprecated in J
         * @return internal index of the last index set added to the
         *         builder
         **/
@@ -220,7 +220,7 @@
             return mIndexTypes.size() - 1;
         }
 
-        /**
+        /** @deprecated renderscript is deprecated in J
         * Adds a vertex data type to the builder object
         *
         * @param t type of the vertex data allocation to be created
@@ -239,7 +239,7 @@
             return this;
         }
 
-        /**
+        /** @deprecated renderscript is deprecated in J
         * Adds a vertex data type to the builder object
         *
         * @param e element describing the vertex data layout
@@ -260,7 +260,7 @@
             return this;
         }
 
-        /**
+        /** @deprecated renderscript is deprecated in J
         * Adds an index set data type to the builder object
         *
         * @param t type of the index set data, could be null
@@ -278,7 +278,7 @@
             return this;
         }
 
-        /**
+        /** @deprecated renderscript is deprecated in J
         * Adds an index set primitive type to the builder object
         *
         * @param p primitive type
@@ -295,7 +295,7 @@
             return this;
         }
 
-        /**
+        /** @deprecated renderscript is deprecated in J
         * Adds an index set data type to the builder object
         *
         * @param e element describing the index set data layout
@@ -320,7 +320,7 @@
             return tb.create();
         }
 
-        /**
+        /** @deprecated renderscript is deprecated in J
         * Create a Mesh object from the current state of the builder
         *
         **/
@@ -372,7 +372,7 @@
         }
     }
 
-    /**
+    /** @deprecated renderscript is deprecated in J
     * Mesh builder object. It starts empty and requires the user to
     * add all the vertex and index allocations that comprise the
     * mesh
@@ -391,6 +391,8 @@
 
         Vector mIndexTypes;
 
+        /** @deprecated renderscript is deprecated in J
+        */
         public AllocationBuilder(RenderScript rs) {
             mRS = rs;
             mVertexTypeCount = 0;
@@ -398,7 +400,7 @@
             mIndexTypes = new Vector();
         }
 
-        /**
+        /** @deprecated renderscript is deprecated in J
         * @return internal index of the last vertex buffer type added to
         *         builder
         **/
@@ -406,7 +408,7 @@
             return mVertexTypeCount - 1;
         }
 
-        /**
+        /** @deprecated renderscript is deprecated in J
         * @return internal index of the last index set added to the
         *         builder
         **/
@@ -414,7 +416,7 @@
             return mIndexTypes.size() - 1;
         }
 
-        /**
+        /** @deprecated renderscript is deprecated in J
         * Adds an allocation containing vertex buffer data to the
         * builder
         *
@@ -433,7 +435,7 @@
             return this;
         }
 
-        /**
+        /** @deprecated renderscript is deprecated in J
         * Adds an allocation containing index buffer data and index type
         * to the builder
         *
@@ -450,7 +452,7 @@
             return this;
         }
 
-        /**
+        /** @deprecated renderscript is deprecated in J
         * Adds an index set type to the builder
         *
         * @param p index set primitive type
@@ -465,7 +467,7 @@
             return this;
         }
 
-        /**
+        /** @deprecated renderscript is deprecated in J
         * Create a Mesh object from the current state of the builder
         *
         **/
@@ -506,7 +508,7 @@
         }
     }
 
-    /**
+    /** @deprecated renderscript is deprecated in J
     * Builder that allows creation of a mesh object point by point
     * and triangle by triangle
     *
@@ -533,11 +535,17 @@
         int mVtxSize;
         int mFlags;
 
+        /** @deprecated renderscript is deprecated in J
+        */
         public static final int COLOR = 0x0001;
+        /** @deprecated renderscript is deprecated in J
+        */
         public static final int NORMAL = 0x0002;
+        /** @deprecated renderscript is deprecated in J
+        */
         public static final int TEXTURE_0 = 0x0100;
 
-        /**
+        /** @deprecated renderscript is deprecated in J
         * @param rs Context to which the mesh will belong.
         * @param vtxSize specifies whether the vertex is a float2 or
         *                float3
@@ -592,7 +600,7 @@
             mMaxIndex ++;
         }
 
-        /**
+        /** @deprecated renderscript is deprecated in J
         * Adds a float2 vertex to the mesh
         *
         * @param x position x
@@ -612,7 +620,7 @@
             return this;
         }
 
-        /**
+        /** @deprecated renderscript is deprecated in J
         * Adds a float3 vertex to the mesh
         *
         * @param x position x
@@ -635,7 +643,7 @@
             return this;
         }
 
-        /**
+        /** @deprecated renderscript is deprecated in J
         * Sets the texture coordinate for the vertices that are added after this method call.
         *
         * @param s texture coordinate s
@@ -652,7 +660,7 @@
             return this;
         }
 
-        /**
+        /** @deprecated renderscript is deprecated in J
         * Sets the normal vector for the vertices that are added after this method call.
         *
         * @param x normal vector x
@@ -671,7 +679,7 @@
             return this;
         }
 
-        /**
+        /** @deprecated renderscript is deprecated in J
         * Sets the color for the vertices that are added after this method call.
         *
         * @param r red component
@@ -692,7 +700,7 @@
             return this;
         }
 
-        /**
+        /** @deprecated renderscript is deprecated in J
         * Adds a new triangle to the mesh builder
         *
         * @param idx1 index of the first vertex in the triangle
@@ -718,7 +726,7 @@
             return this;
         }
 
-        /**
+        /** @deprecated renderscript is deprecated in J
         * Creates the mesh object from the current state of the builder
         *
         * @param uploadToBufferObject specifies whether the vertex data
diff --git a/graphics/java/android/renderscript/Path.java b/graphics/java/android/renderscript/Path.java
index 9c4d41b..ec34d7c 100644
--- a/graphics/java/android/renderscript/Path.java
+++ b/graphics/java/android/renderscript/Path.java
@@ -19,7 +19,7 @@
 import java.util.Vector;
 import android.util.Log;
 
-/**
+/** @deprecated renderscript is deprecated in J
  * @hide
  *
  */
diff --git a/graphics/java/android/renderscript/Program.java b/graphics/java/android/renderscript/Program.java
index d9f64c6..16186fa 100644
--- a/graphics/java/android/renderscript/Program.java
+++ b/graphics/java/android/renderscript/Program.java
@@ -25,7 +25,7 @@
 import android.util.Log;
 
 
-/**
+/** @deprecated renderscript is deprecated in J
  *
  * Program is a base class for all the objects that modify
  * various stages of the graphics pipeline
@@ -37,14 +37,18 @@
     static final int MAX_CONSTANT = 8;
     static final int MAX_TEXTURE = 8;
 
-    /**
+    /** @deprecated renderscript is deprecated in J
      *
      * TextureType specifies what textures are attached to Program
      * objects
      *
      **/
     public enum TextureType {
+        /** @deprecated renderscript is deprecated in J
+        */
         TEXTURE_2D (0),
+        /** @deprecated renderscript is deprecated in J
+        */
         TEXTURE_CUBE (1);
 
         int mID;
@@ -77,7 +81,7 @@
         super(id, rs);
     }
 
-    /**
+    /** @hide renderscript is deprecated in J
      * Program object can have zero or more constant allocations
      * associated with it. This method returns the total count.
      * @return number of constant input types
@@ -86,7 +90,7 @@
         return mConstants != null ? mConstants.length : 0;
     }
 
-    /**
+    /** @hide renderscript is deprecated in J
      * Returns the type of the constant buffer used in the program
      * object. It could be used to query internal elements or create
      * an allocation to store constant data.
@@ -100,7 +104,7 @@
         return mConstants[slot];
     }
 
-    /**
+    /** @hide renderscript is deprecated in J
      * Returns the number of textures used in this program object
      * @return number of texture inputs
      */
@@ -108,7 +112,7 @@
         return mTextureCount;
     }
 
-    /**
+    /** @hide renderscript is deprecated in J
      * Returns the type of texture at a given slot. e.g. 2D or Cube
      * @param slot index of the texture input
      * @return texture input type
@@ -120,7 +124,7 @@
         return mTextures[slot];
     }
 
-    /**
+    /** @hide renderscript is deprecated in J
      * Returns the name of the texture input at a given slot. e.g.
      * tex0, diffuse, spec
      * @param slot index of the texture input
@@ -133,7 +137,7 @@
         return mTextureNames[slot];
     }
 
-    /**
+    /** @deprecated renderscript is deprecated in J
      * Binds a constant buffer to be used as uniform inputs to the
      * program
      *
@@ -153,7 +157,7 @@
         mRS.nProgramBindConstants(getID(mRS), slot, id);
     }
 
-    /**
+    /** @deprecated renderscript is deprecated in J
      * Binds a texture to be used in the program
      *
      * @param va allocation containing texture data
@@ -175,7 +179,7 @@
         mRS.nProgramBindTexture(getID(mRS), slot, id);
     }
 
-    /**
+    /** @deprecated renderscript is deprecated in J
      * Binds an object that describes how a texture at the
      * corresponding location is sampled
      *
@@ -210,7 +214,8 @@
         int mTextureCount;
         String mShader;
 
-
+        /** @deprecated renderscript is deprecated in J
+        */
         protected BaseProgramBuilder(RenderScript rs) {
             mRS = rs;
             mInputs = new Element[MAX_INPUT];
@@ -224,7 +229,7 @@
             mTextureNames = new String[MAX_TEXTURE];
         }
 
-        /**
+        /** @deprecated renderscript is deprecated in J
          * Sets the GLSL shader code to be used in the program
          *
          * @param s GLSL shader string
@@ -235,7 +240,7 @@
             return this;
         }
 
-        /**
+        /** @deprecated renderscript is deprecated in J
          * Sets the GLSL shader code to be used in the program
          *
          * @param resources application resources
@@ -281,7 +286,7 @@
             return this;
         }
 
-        /**
+        /** @deprecated renderscript is deprecated in J
          * Queries the index of the last added constant buffer type
          *
          */
@@ -289,7 +294,7 @@
             return mConstantCount - 1;
         }
 
-        /**
+        /** @deprecated renderscript is deprecated in J
          * Queries the index of the last added texture type
          *
          */
@@ -297,7 +302,7 @@
             return mTextureCount - 1;
         }
 
-        /**
+        /** @deprecated renderscript is deprecated in J
          * Adds constant (uniform) inputs to the program
          *
          * @param t Type that describes the layout of the Allocation
@@ -317,7 +322,7 @@
             return this;
         }
 
-        /**
+        /** @deprecated renderscript is deprecated in J
          * Adds a texture input to the Program
          *
          * @param texType describes that the texture to append it (2D,
@@ -329,7 +334,7 @@
             return this;
         }
 
-        /**
+        /** @hide renderscript is deprecated in J
          * Adds a texture input to the Program
          *
          * @param texType describes that the texture to append it (2D,
@@ -349,6 +354,8 @@
             return this;
         }
 
+        /** @deprecated renderscript is deprecated in J
+        */
         protected void initProgram(Program p) {
             p.mInputs = new Element[mInputCount];
             System.arraycopy(mInputs, 0, p.mInputs, 0, mInputCount);
diff --git a/graphics/java/android/renderscript/ProgramFragment.java b/graphics/java/android/renderscript/ProgramFragment.java
index fa6e2d4..0427c19 100644
--- a/graphics/java/android/renderscript/ProgramFragment.java
+++ b/graphics/java/android/renderscript/ProgramFragment.java
@@ -20,7 +20,7 @@
 import android.util.Log;
 
 
-/**
+/** @deprecated renderscript is deprecated in J
  * <p>The Renderscript fragment program, also known as fragment shader is responsible
  * for manipulating pixel data in a user defined way. It's constructed from a GLSL
  * shader string containing the program body, textures inputs, and a Type object
@@ -42,7 +42,7 @@
     }
 
     public static class Builder extends BaseProgramBuilder {
-        /**
+        /** @deprecated renderscript is deprecated in J
          * Create a builder object.
          *
          * @param rs Context to which the program will belong.
@@ -51,7 +51,7 @@
             super(rs);
         }
 
-        /**
+        /** @deprecated renderscript is deprecated in J
          * Creates ProgramFragment from the current state of the builder
          *
          * @return  ProgramFragment
diff --git a/graphics/java/android/renderscript/ProgramFragmentFixedFunction.java b/graphics/java/android/renderscript/ProgramFragmentFixedFunction.java
index 14f10f1..19fca58 100644
--- a/graphics/java/android/renderscript/ProgramFragmentFixedFunction.java
+++ b/graphics/java/android/renderscript/ProgramFragmentFixedFunction.java
@@ -20,7 +20,7 @@
 import android.util.Log;
 
 
-/**
+/** @deprecated renderscript is deprecated in J
  * <p>ProgramFragmentFixedFunction is a helper class that provides
  * a way to make a simple fragment shader without writing any
  * GLSL code. This class allows for display of constant color, interpolated
@@ -38,7 +38,7 @@
             super(rs);
         }
 
-        /**
+        /** @deprecated renderscript is deprecated in J
          * Creates ProgramFragmentFixedFunction from the current state
          * of the builder
          *
@@ -76,6 +76,8 @@
     }
 
     public static class Builder {
+        /** @deprecated renderscript is deprecated in J
+        */
         public static final int MAX_TEXTURE = 2;
         int mNumTextures;
         boolean mPointSpriteEnable;
@@ -83,14 +85,20 @@
         String mShader;
         RenderScript mRS;
 
-        /**
+        /** @deprecated renderscript is deprecated in J
          * EnvMode describes how textures are combined with the existing
          * color in the fixed function fragment shader
          *
          **/
         public enum EnvMode {
+            /** @deprecated renderscript is deprecated in J
+            */
             REPLACE (1),
+            /** @deprecated renderscript is deprecated in J
+            */
             MODULATE (2),
+            /** @deprecated renderscript is deprecated in J
+            */
             DECAL (3);
 
             int mID;
@@ -99,15 +107,23 @@
             }
         }
 
-        /**
+        /** @deprecated renderscript is deprecated in J
          * Format describes the pixel format of textures in the fixed
          * function fragment shader and how they are sampled
          *
          **/
         public enum Format {
+            /** @deprecated renderscript is deprecated in J
+            */
             ALPHA (1),
+            /** @deprecated renderscript is deprecated in J
+            */
             LUMINANCE_ALPHA (2),
+            /** @deprecated renderscript is deprecated in J
+            */
             RGB (3),
+            /** @deprecated renderscript is deprecated in J
+            */
             RGBA (4);
 
             int mID;
@@ -190,7 +206,7 @@
             mShader += "}\n";
         }
 
-        /**
+        /** @deprecated renderscript is deprecated in J
          * Creates a builder for fixed function fragment program
          *
          * @param rs Context to which the program will belong.
@@ -201,7 +217,7 @@
             mPointSpriteEnable = false;
         }
 
-        /**
+        /** @deprecated renderscript is deprecated in J
          * Adds a texture to be fetched as part of the fixed function
          * fragment program
          *
@@ -223,7 +239,7 @@
             return this;
         }
 
-        /**
+        /** @deprecated renderscript is deprecated in J
          * Specifies whether the texture coordinate passed from the
          * vertex program is replaced with an openGL internal point
          * sprite texture coordinate
@@ -234,7 +250,7 @@
             return this;
         }
 
-        /**
+        /** @deprecated renderscript is deprecated in J
          * Specifies whether the varying color passed from the vertex
          * program or the constant color set on the fragment program is
          * used in the final color calculation in the fixed function
@@ -246,7 +262,7 @@
             return this;
         }
 
-        /**
+        /** @deprecated renderscript is deprecated in J
         * Creates the fixed function fragment program from the current
         * state of the builder.
         *
diff --git a/graphics/java/android/renderscript/ProgramRaster.java b/graphics/java/android/renderscript/ProgramRaster.java
index e40751f..26fcafe 100644
--- a/graphics/java/android/renderscript/ProgramRaster.java
+++ b/graphics/java/android/renderscript/ProgramRaster.java
@@ -20,15 +20,23 @@
 import android.util.Log;
 
 
-/**
+/** @deprecated renderscript is deprecated in J
  * Program raster is primarily used to specify whether point sprites are enabled and to control
  * the culling mode. By default, back faces are culled.
  **/
 public class ProgramRaster extends BaseObj {
 
+    /** @deprecated renderscript is deprecated in J
+     */
     public enum CullMode {
+        /** @deprecated renderscript is deprecated in J
+        */
         BACK (0),
+        /** @deprecated renderscript is deprecated in J
+        */
         FRONT (1),
+        /** @deprecated renderscript is deprecated in J
+        */
         NONE (2);
 
         int mID;
@@ -47,7 +55,7 @@
         mCullMode = CullMode.BACK;
     }
 
-    /**
+    /** @hide renderscript is deprecated in J
      * Specifies whether vertices are rendered as screen aligned
      * elements of a specified size
      * @return whether point sprites are enabled
@@ -56,7 +64,7 @@
         return mPointSprite;
     }
 
-    /**
+    /** @hide renderscript is deprecated in J
      * Specifies how triangles are culled based on their orientation
      * @return cull mode
      */
@@ -64,6 +72,8 @@
         return mCullMode;
     }
 
+    /** @deprecated renderscript is deprecated in J
+     */
     public static ProgramRaster CULL_BACK(RenderScript rs) {
         if(rs.mProgramRaster_CULL_BACK == null) {
             ProgramRaster.Builder builder = new ProgramRaster.Builder(rs);
@@ -73,6 +83,8 @@
         return rs.mProgramRaster_CULL_BACK;
     }
 
+    /** @deprecated renderscript is deprecated in J
+     */
     public static ProgramRaster CULL_FRONT(RenderScript rs) {
         if(rs.mProgramRaster_CULL_FRONT == null) {
             ProgramRaster.Builder builder = new ProgramRaster.Builder(rs);
@@ -82,6 +94,8 @@
         return rs.mProgramRaster_CULL_FRONT;
     }
 
+    /** @deprecated renderscript is deprecated in J
+     */
     public static ProgramRaster CULL_NONE(RenderScript rs) {
         if(rs.mProgramRaster_CULL_NONE == null) {
             ProgramRaster.Builder builder = new ProgramRaster.Builder(rs);
@@ -91,27 +105,37 @@
         return rs.mProgramRaster_CULL_NONE;
     }
 
+    /** @deprecated renderscript is deprecated in J
+     */
     public static class Builder {
         RenderScript mRS;
         boolean mPointSprite;
         CullMode mCullMode;
 
+        /** @deprecated renderscript is deprecated in J
+        */
         public Builder(RenderScript rs) {
             mRS = rs;
             mPointSprite = false;
             mCullMode = CullMode.BACK;
         }
 
+        /** @deprecated renderscript is deprecated in J
+        */
         public Builder setPointSpriteEnabled(boolean enable) {
             mPointSprite = enable;
             return this;
         }
 
+        /** @deprecated renderscript is deprecated in J
+        */
         public Builder setCullMode(CullMode m) {
             mCullMode = m;
             return this;
         }
 
+        /** @deprecated renderscript is deprecated in J
+        */
         public ProgramRaster create() {
             mRS.validate();
             int id = mRS.nProgramRasterCreate(mPointSprite, mCullMode.mID);
diff --git a/graphics/java/android/renderscript/ProgramStore.java b/graphics/java/android/renderscript/ProgramStore.java
index d0fd6e5..20043f2 100644
--- a/graphics/java/android/renderscript/ProgramStore.java
+++ b/graphics/java/android/renderscript/ProgramStore.java
@@ -20,7 +20,7 @@
 import android.util.Log;
 
 
-/**
+/** @deprecated renderscript is deprecated in J
  * <p>ProgramStore contains a set of parameters that control how
  * the graphics hardware handles writes to the framebuffer.
  * It could be used to:</p>
@@ -35,7 +35,7 @@
  *
  **/
 public class ProgramStore extends BaseObj {
-    /**
+    /** @deprecated renderscript is deprecated in J
     * Specifies the function used to determine whether a fragment
     * will be drawn during the depth testing stage in the rendering
     * pipeline by comparing its value with that already in the depth
@@ -44,36 +44,36 @@
     */
     public enum DepthFunc {
 
-        /**
+        /** @deprecated renderscript is deprecated in J
         * Always drawn
         */
         ALWAYS (0),
-        /**
+        /** @deprecated renderscript is deprecated in J
         * Drawn if the incoming depth value is less than that in the
         * depth buffer
         */
         LESS (1),
-        /**
+        /** @deprecated renderscript is deprecated in J
         * Drawn if the incoming depth value is less or equal to that in
         * the depth buffer
         */
         LESS_OR_EQUAL (2),
-        /**
+        /** @deprecated renderscript is deprecated in J
         * Drawn if the incoming depth value is greater than that in the
         * depth buffer
         */
         GREATER (3),
-        /**
+        /** @deprecated renderscript is deprecated in J
         * Drawn if the incoming depth value is greater or equal to that
         * in the depth buffer
         */
         GREATER_OR_EQUAL (4),
-        /**
+        /** @deprecated renderscript is deprecated in J
         * Drawn if the incoming depth value is equal to that in the
         * depth buffer
         */
         EQUAL (5),
-        /**
+        /** @deprecated renderscript is deprecated in J
         * Drawn if the incoming depth value is not equal to that in the
         * depth buffer
         */
@@ -85,7 +85,7 @@
         }
     }
 
-    /**
+    /** @deprecated renderscript is deprecated in J
     * Specifies the functions used to combine incoming pixels with
     * those already in the frame buffer.
     *
@@ -94,14 +94,32 @@
     *
     */
     public enum BlendSrcFunc {
+        /** @deprecated renderscript is deprecated in J
+        */
         ZERO (0),
+        /** @deprecated renderscript is deprecated in J
+        */
         ONE (1),
+        /** @deprecated renderscript is deprecated in J
+        */
         DST_COLOR (2),
+        /** @deprecated renderscript is deprecated in J
+        */
         ONE_MINUS_DST_COLOR (3),
+        /** @deprecated renderscript is deprecated in J
+        */
         SRC_ALPHA (4),
+        /** @deprecated renderscript is deprecated in J
+        */
         ONE_MINUS_SRC_ALPHA (5),
+        /** @deprecated renderscript is deprecated in J
+        */
         DST_ALPHA (6),
+        /** @deprecated renderscript is deprecated in J
+        */
         ONE_MINUS_DST_ALPHA (7),
+        /** @deprecated renderscript is deprecated in J
+        */
         SRC_ALPHA_SATURATE (8);
 
         int mID;
@@ -110,7 +128,7 @@
         }
     }
 
-    /**
+    /** @deprecated renderscript is deprecated in J
     * Specifies the functions used to combine incoming pixels with
     * those already in the frame buffer.
     *
@@ -120,13 +138,29 @@
     *
     */
     public enum BlendDstFunc {
+        /** @deprecated renderscript is deprecated in J
+        */
         ZERO (0),
+        /** @deprecated renderscript is deprecated in J
+        */
         ONE (1),
+        /** @deprecated renderscript is deprecated in J
+        */
         SRC_COLOR (2),
+        /** @deprecated renderscript is deprecated in J
+        */
         ONE_MINUS_SRC_COLOR (3),
+        /** @deprecated renderscript is deprecated in J
+        */
         SRC_ALPHA (4),
+        /** @deprecated renderscript is deprecated in J
+        */
         ONE_MINUS_SRC_ALPHA (5),
+        /** @deprecated renderscript is deprecated in J
+        */
         DST_ALPHA (6),
+        /** @deprecated renderscript is deprecated in J
+        */
         ONE_MINUS_DST_ALPHA (7);
 
         int mID;
@@ -149,7 +183,7 @@
         super(id, rs);
     }
 
-    /**
+    /** @hide renderscript is deprecated in J
     * Returns the function used to test writing into the depth
     * buffer
     * @return depth function
@@ -158,7 +192,7 @@
         return mDepthFunc;
     }
 
-    /**
+    /** @hide renderscript is deprecated in J
     * Queries whether writes are enabled into the depth buffer
     * @return depth mask
     */
@@ -166,7 +200,7 @@
         return mDepthMask;
     }
 
-    /**
+    /** @hide renderscript is deprecated in J
     * Queries whether red channel is written
     * @return red color channel mask
     */
@@ -174,7 +208,7 @@
         return mColorMaskR;
     }
 
-    /**
+    /** @hide renderscript is deprecated in J
     * Queries whether green channel is written
     * @return green color channel mask
     */
@@ -182,7 +216,7 @@
         return mColorMaskG;
     }
 
-    /**
+    /** @hide renderscript is deprecated in J
     * Queries whether blue channel is written
     * @return blue color channel mask
     */
@@ -190,7 +224,7 @@
         return mColorMaskB;
     }
 
-    /**
+    /** @hide renderscript is deprecated in J
     * Queries whether alpha channel is written
     * @return alpha channel mask
     */
@@ -198,7 +232,7 @@
         return mColorMaskA;
     }
 
-    /**
+    /** @hide renderscript is deprecated in J
     * Specifies how the source blending factor is computed
     * @return source blend function
     */
@@ -206,7 +240,7 @@
         return mBlendSrc;
     }
 
-    /**
+    /** @hide renderscript is deprecated in J
     * Specifies how the destination blending factor is computed
     * @return destination blend function
     */
@@ -214,7 +248,7 @@
         return mBlendDst;
     }
 
-    /**
+    /** @hide renderscript is deprecated in J
     * Specifies whether colors are dithered before writing into the
     * framebuffer
     * @return whether dither is enabled
@@ -223,7 +257,7 @@
         return mDither;
     }
 
-    /**
+    /** @deprecated renderscript is deprecated in J
     * Returns a pre-defined program store object with the following
     * characteristics:
     *  - incoming pixels are drawn if their depth value is less than
@@ -245,7 +279,7 @@
         }
         return rs.mProgramStore_BLEND_NONE_DEPTH_TEST;
     }
-    /**
+    /** @deprecated renderscript is deprecated in J
     * Returns a pre-defined program store object with the following
     * characteristics:
     *  - incoming pixels always pass the depth test and their value
@@ -266,7 +300,7 @@
         }
         return rs.mProgramStore_BLEND_NONE_DEPTH_NO_DEPTH;
     }
-    /**
+    /** @deprecated renderscript is deprecated in J
     * Returns a pre-defined program store object with the following
     * characteristics:
     *  - incoming pixels are drawn if their depth value is less than
@@ -290,7 +324,7 @@
         }
         return rs.mProgramStore_BLEND_ALPHA_DEPTH_TEST;
     }
-    /**
+    /** @deprecated renderscript is deprecated in J
     * Returns a pre-defined program store object with the following
     * characteristics:
     *  - incoming pixels always pass the depth test and their value
@@ -313,7 +347,7 @@
         return rs.mProgramStore_BLEND_ALPHA_DEPTH_NO_DEPTH;
     }
 
-    /**
+    /** @deprecated renderscript is deprecated in J
     * Builder class for ProgramStore object. If the builder is left
     * empty, the equivalent of BLEND_NONE_DEPTH_NONE would be
     * returned
@@ -342,7 +376,7 @@
             mBlendDst = BlendDstFunc.ZERO;
         }
 
-        /**
+        /** @deprecated renderscript is deprecated in J
         * Specifies the depth testing behavior
         *
         * @param func function used for depth testing
@@ -354,7 +388,7 @@
             return this;
         }
 
-        /**
+        /** @deprecated renderscript is deprecated in J
         * Enables writes into the depth buffer
         *
         * @param enable specifies whether depth writes are
@@ -367,7 +401,7 @@
             return this;
         }
 
-        /**
+        /** @deprecated renderscript is deprecated in J
         * Enables writes into the color buffer
         *
         * @param r specifies whether red channel is written
@@ -385,7 +419,7 @@
             return this;
         }
 
-        /**
+        /** @deprecated renderscript is deprecated in J
         * Specifies how incoming pixels are combined with the pixels
         * stored in the framebuffer
         *
@@ -402,7 +436,7 @@
             return this;
         }
 
-        /**
+        /** @deprecated renderscript is deprecated in J
         * Enables dithering
         *
         * @param enable specifies whether dithering is enabled or
@@ -415,7 +449,7 @@
             return this;
         }
 
-        /**
+        /** @deprecated renderscript is deprecated in J
         * Creates a program store from the current state of the builder
         */
         public ProgramStore create() {
diff --git a/graphics/java/android/renderscript/ProgramVertex.java b/graphics/java/android/renderscript/ProgramVertex.java
index 74d666b..c13b9b0 100644
--- a/graphics/java/android/renderscript/ProgramVertex.java
+++ b/graphics/java/android/renderscript/ProgramVertex.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
- /**
+ /** @deprecated renderscript is deprecated in J
  * <p>The Renderscript vertex program, also known as a vertex shader, describes a stage in
  * the graphics pipeline responsible for manipulating geometric data in a user-defined way.
  * The object is constructed by providing the Renderscript system with the following data:</p>
@@ -42,7 +42,7 @@
 import android.util.Log;
 
 
-/**
+/** @deprecated renderscript is deprecated in J
  * ProgramVertex, also know as a vertex shader, describes a
  * stage in the graphics pipeline responsible for manipulating
  * geometric data in a user-defined way.
@@ -54,14 +54,14 @@
         super(id, rs);
     }
 
-    /**
+    /** @hide renderscript is deprecated in J
      * @return number of input attribute elements
      */
     public int getInputCount() {
         return mInputs != null ? mInputs.length : 0;
     }
 
-    /**
+    /** @hide renderscript is deprecated in J
      * @param slot location of the input to return
      * @return input attribute element
      */
@@ -72,7 +72,7 @@
         return mInputs[slot];
     }
 
-    /**
+    /** @deprecated renderscript is deprecated in J
     * Builder class for creating ProgramVertex objects.
     * The builder starts empty and the user must minimally provide
     * the GLSL shader code, and the varying inputs. Constant, or
@@ -81,7 +81,7 @@
     *
     **/
     public static class Builder extends BaseProgramBuilder {
-        /**
+        /** @deprecated renderscript is deprecated in J
          * Create a builder object.
          *
          * @param rs Context to which the program will belong.
@@ -90,7 +90,7 @@
             super(rs);
         }
 
-        /**
+        /** @deprecated renderscript is deprecated in J
          * Add varying inputs to the program
          *
          * @param e element describing the layout of the varying input
@@ -109,7 +109,7 @@
             return this;
         }
 
-        /**
+        /** @deprecated renderscript is deprecated in J
          * Creates ProgramVertex from the current state of the builder
          *
          * @return  ProgramVertex
diff --git a/graphics/java/android/renderscript/ProgramVertexFixedFunction.java b/graphics/java/android/renderscript/ProgramVertexFixedFunction.java
index 54f21b8..97444db 100644
--- a/graphics/java/android/renderscript/ProgramVertexFixedFunction.java
+++ b/graphics/java/android/renderscript/ProgramVertexFixedFunction.java
@@ -21,7 +21,7 @@
 import android.util.Log;
 
 
-/**
+/** @deprecated renderscript is deprecated in J
  * ProgramVertexFixedFunction is a helper class that provides a
  * simple way to create a fixed function emulation vertex shader
  * without writing any GLSL code.
@@ -33,7 +33,7 @@
         super(id, rs);
     }
 
-    /**
+    /** @deprecated renderscript is deprecated in J
      * Binds the constant buffer containing fixed function emulation
      * matrices
      *
@@ -61,7 +61,7 @@
             return this;
         }
 
-        /**
+        /** @deprecated renderscript is deprecated in J
          * Creates ProgramVertexFixedFunction from the current state of
          * the builder
          *
@@ -103,7 +103,7 @@
         String mShader;
         RenderScript mRS;
 
-        /**
+        /** @deprecated renderscript is deprecated in J
          * Creates a builder for fixed function vertex program
          *
          * @param rs Context to which the program will belong.
@@ -112,7 +112,7 @@
             mRS = rs;
         }
 
-        /**
+        /** @deprecated renderscript is deprecated in J
          * Specifies whether texture matrix calculations are to be added
          * to the shader
          *
@@ -152,7 +152,7 @@
             mShader += "}\n";
         }
 
-        /**
+        /** @deprecated renderscript is deprecated in J
          * Creates ProgramVertexFixedFunction from the current state of
          * the builder
          *
@@ -176,7 +176,7 @@
         }
     }
 
-    /**
+    /** @deprecated renderscript is deprecated in J
      * Helper class to store modelview, projection and texture
      * matrices for ProgramVertexFixedFunction
      *
@@ -196,7 +196,7 @@
         }
         private FieldPacker mIOBuffer;
 
-        /**
+        /** @deprecated renderscript is deprecated in J
         * Creates a buffer to store fixed function emulation matrices
         *
         * @param rs Context to which the allocation will belong.
@@ -215,7 +215,7 @@
             setTexture(new Matrix4f());
         }
 
-        /**
+        /** @deprecated renderscript is deprecated in J
         * Forces deallocation of memory backing the contant matrices.
         * Normally, this is unnecessary and will be garbage collected
         *
@@ -233,7 +233,7 @@
             mAlloc.setFromFieldPacker(0, mIOBuffer);
         }
 
-        /**
+        /** @deprecated renderscript is deprecated in J
         * Sets the modelview matrix in the fixed function matrix buffer
         *
         * @param m modelview matrix
@@ -243,7 +243,7 @@
             addToBuffer(MODELVIEW_OFFSET*4, m);
         }
 
-        /**
+        /** @deprecated renderscript is deprecated in J
         * Sets the projection matrix in the fixed function matrix buffer
         *
         * @param m projection matrix
@@ -253,7 +253,7 @@
             addToBuffer(PROJECTION_OFFSET*4, m);
         }
 
-        /**
+        /** @deprecated renderscript is deprecated in J
         * Sets the texture matrix in the fixed function matrix buffer.
         * Texture matrix must be enabled in the
         * ProgramVertexFixedFunction builder for the shader to utilize
diff --git a/graphics/java/android/renderscript/RSDriverException.java b/graphics/java/android/renderscript/RSDriverException.java
index ce85b53..1784087 100644
--- a/graphics/java/android/renderscript/RSDriverException.java
+++ b/graphics/java/android/renderscript/RSDriverException.java
@@ -17,7 +17,7 @@
 package android.renderscript;
 
 
-/**
+/** @deprecated renderscript is deprecated in J
  * Base class for all exceptions thrown by the Android
  * Renderscript
  */
diff --git a/graphics/java/android/renderscript/RSIllegalArgumentException.java b/graphics/java/android/renderscript/RSIllegalArgumentException.java
index 954c0e8..039d8f5 100644
--- a/graphics/java/android/renderscript/RSIllegalArgumentException.java
+++ b/graphics/java/android/renderscript/RSIllegalArgumentException.java
@@ -17,11 +17,13 @@
 package android.renderscript;
 
 
-/**
+/** @deprecated renderscript is deprecated in J
  * Base class for all exceptions thrown by the Android
  * Renderscript
  */
 public class RSIllegalArgumentException extends RSRuntimeException {
+    /** @deprecated renderscript is deprecated in J
+    */
     public RSIllegalArgumentException(String string) {
         super(string);
     }
diff --git a/graphics/java/android/renderscript/RSInvalidStateException.java b/graphics/java/android/renderscript/RSInvalidStateException.java
index 691aeba..ccbaea1 100644
--- a/graphics/java/android/renderscript/RSInvalidStateException.java
+++ b/graphics/java/android/renderscript/RSInvalidStateException.java
@@ -17,11 +17,13 @@
 package android.renderscript;
 
 
-/**
+/** @deprecated renderscript is deprecated in J
  * Base class for all exceptions thrown by the Android
  * Renderscript
  */
 public class RSInvalidStateException extends RSRuntimeException {
+    /** @deprecated renderscript is deprecated in J
+    */
     public RSInvalidStateException(String string) {
         super(string);
     }
diff --git a/graphics/java/android/renderscript/RSRuntimeException.java b/graphics/java/android/renderscript/RSRuntimeException.java
index 5a16478..3fb1ea9 100644
--- a/graphics/java/android/renderscript/RSRuntimeException.java
+++ b/graphics/java/android/renderscript/RSRuntimeException.java
@@ -17,12 +17,14 @@
 package android.renderscript;
 
 
-/**
+/** @deprecated renderscript is deprecated in J
  * Base class for all exceptions thrown by the Android
  * Renderscript
  */
 public class RSRuntimeException
   extends java.lang.RuntimeException {
+    /** @deprecated renderscript is deprecated in J
+    */
     public RSRuntimeException(String string) {
         super(string);
     }
diff --git a/graphics/java/android/renderscript/RSSurfaceView.java b/graphics/java/android/renderscript/RSSurfaceView.java
index 6756fd0..997b7d0 100644
--- a/graphics/java/android/renderscript/RSSurfaceView.java
+++ b/graphics/java/android/renderscript/RSSurfaceView.java
@@ -29,7 +29,7 @@
 import android.view.SurfaceHolder;
 import android.view.SurfaceView;
 
-/**
+/** @deprecated renderscript is deprecated in J
  * The Surface View for a graphics renderscript (RenderScriptGL) to draw on.
  *
  * <div class="special reference">
@@ -42,7 +42,7 @@
     private SurfaceHolder mSurfaceHolder;
     private RenderScriptGL mRS;
 
-    /**
+    /** @deprecated renderscript is deprecated in J
      * Standard View constructor. In order to render something, you
      * must call {@link android.opengl.GLSurfaceView#setRenderer} to
      * register a renderer.
@@ -53,7 +53,7 @@
         //Log.v(RenderScript.LOG_TAG, "RSSurfaceView");
     }
 
-    /**
+    /** @deprecated renderscript is deprecated in J
      * Standard View constructor. In order to render something, you
      * must call {@link android.opengl.GLSurfaceView#setRenderer} to
      * register a renderer.
@@ -71,7 +71,7 @@
         holder.addCallback(this);
     }
 
-    /**
+    /** @deprecated renderscript is deprecated in J
      * This method is part of the SurfaceHolder.Callback interface, and is
      * not normally called or subclassed by clients of RSSurfaceView.
      */
@@ -79,7 +79,7 @@
         mSurfaceHolder = holder;
     }
 
-    /**
+    /** @deprecated renderscript is deprecated in J
      * This method is part of the SurfaceHolder.Callback interface, and is
      * not normally called or subclassed by clients of RSSurfaceView.
      */
@@ -92,7 +92,7 @@
         }
     }
 
-    /**
+    /** @deprecated renderscript is deprecated in J
      * This method is part of the SurfaceHolder.Callback interface, and is
      * not normally called or subclassed by clients of RSSurfaceView.
      */
@@ -104,7 +104,7 @@
         }
     }
 
-   /**
+   /** @deprecated renderscript is deprecated in J
      * Inform the view that the activity is paused. The owner of this view must
      * call this method when the activity is paused. Calling this method will
      * pause the rendering thread.
@@ -116,7 +116,7 @@
         }
     }
 
-    /**
+    /** @deprecated renderscript is deprecated in J
      * Inform the view that the activity is resumed. The owner of this view must
      * call this method when the activity is resumed. Calling this method will
      * recreate the OpenGL display and resume the rendering
diff --git a/graphics/java/android/renderscript/RSTextureView.java b/graphics/java/android/renderscript/RSTextureView.java
index 30b2f99..b40f73c 100644
--- a/graphics/java/android/renderscript/RSTextureView.java
+++ b/graphics/java/android/renderscript/RSTextureView.java
@@ -28,7 +28,7 @@
 import android.util.Log;
 import android.view.TextureView;
 
-/**
+/** @deprecated renderscript is deprecated in J
  * The Texture View for a graphics renderscript (RenderScriptGL)
  * to draw on.
  *
@@ -37,7 +37,7 @@
     private RenderScriptGL mRS;
     private SurfaceTexture mSurfaceTexture;
 
-    /**
+    /** @deprecated renderscript is deprecated in J
      * Standard View constructor. In order to render something, you
      * must call {@link android.opengl.GLSurfaceView#setRenderer} to
      * register a renderer.
@@ -48,7 +48,7 @@
         //Log.v(RenderScript.LOG_TAG, "RSSurfaceView");
     }
 
-    /**
+    /** @deprecated renderscript is deprecated in J
      * Standard View constructor. In order to render something, you
      * must call {@link android.opengl.GLSurfaceView#setRenderer} to
      * register a renderer.
@@ -102,7 +102,7 @@
         mSurfaceTexture = surface;
     }
 
-   /**
+   /** @deprecated renderscript is deprecated in J
      * Inform the view that the activity is paused. The owner of this view must
      * call this method when the activity is paused. Calling this method will
      * pause the rendering thread.
@@ -114,7 +114,7 @@
         }
     }
 
-    /**
+    /** @deprecated renderscript is deprecated in J
      * Inform the view that the activity is resumed. The owner of this view must
      * call this method when the activity is resumed. Calling this method will
      * recreate the OpenGL display and resume the rendering
@@ -127,7 +127,7 @@
         }
     }
 
-    /**
+    /** @deprecated renderscript is deprecated in J
      * Create a new RenderScriptGL object and attach it to the
      * TextureView if present.
      *
@@ -145,7 +145,7 @@
         return rs;
     }
 
-    /**
+    /** @deprecated renderscript is deprecated in J
      * Destroy the RenderScriptGL object associated with this
      * TextureView.
      */
@@ -154,7 +154,7 @@
         mRS = null;
     }
 
-    /**
+    /** @deprecated renderscript is deprecated in J
      * Set a new RenderScriptGL object.  This also will attach the
      * new object to the TextureView if present.
      *
@@ -167,7 +167,7 @@
         }
     }
 
-    /**
+    /** @deprecated renderscript is deprecated in J
      * Returns the previously set RenderScriptGL object.
      *
      * @return RenderScriptGL
diff --git a/graphics/java/android/renderscript/RenderScript.java b/graphics/java/android/renderscript/RenderScript.java
index abbcdd9..9a5b349 100644
--- a/graphics/java/android/renderscript/RenderScript.java
+++ b/graphics/java/android/renderscript/RenderScript.java
@@ -32,7 +32,7 @@
 
 
 
-/**
+/** @deprecated renderscript is deprecated in J
  * Renderscript base master class.  An instance of this class creates native
  * worker threads for processing commands from this object.  This base class
  * does not provide any extended capabilities beyond simple data processing.
@@ -736,7 +736,7 @@
     ///////////////////////////////////////////////////////////////////////////////////
     //
 
-    /**
+    /** @deprecated renderscript is deprecated in J
      * Base class application should derive from for handling RS messages
      * coming from their scripts.  When a script calls sendToClient the data
      * fields will be filled in and then the run method called by a message
@@ -751,7 +751,7 @@
         public void run() {
         }
     }
-    /**
+    /** @deprecated renderscript is deprecated in J
      * If an application is expecting messages it should set this field to an
      * instance of RSMessage.  This instance will receive all the user messages
      * sent from sendToClient by scripts from this context.
@@ -766,7 +766,7 @@
         return mMessageCallback;
     }
 
-    /**
+    /** @deprecated renderscript is deprecated in J
      * Runtime error base class.  An application should derive from this class
      * if it wishes to install an error handler.  When errors occur at runtime
      * the fields in this class will be filled and the run method called.
@@ -779,7 +779,7 @@
         }
     }
 
-    /**
+    /** @deprecated renderscript is deprecated in J
      * Application Error handler.  All runtime errors will be dispatched to the
      * instance of RSAsyncError set here.  If this field is null a
      * RSRuntimeException will instead be thrown with details about the error.
@@ -795,7 +795,7 @@
         return mErrorCallback;
     }
 
-    /**
+    /** @deprecated renderscript is deprecated in J
      * RenderScript worker threads priority enumeration.  The default value is
      * NORMAL.  Applications wishing to do background processing such as
      * wallpapers should set their priority to LOW to avoid starving forground
@@ -818,7 +818,7 @@
     }
 
 
-    /**
+    /** @deprecated renderscript is deprecated in J
      * Change the priority of the worker threads for this context.
      *
      * @param p New priority to be set.
@@ -915,7 +915,7 @@
         }
     }
 
-    /**
+    /** @deprecated renderscript is deprecated in J
      * Gets the application context associated with the RenderScript context.
      *
      * @return The application context.
@@ -924,7 +924,7 @@
         return mApplicationContext;
     }
 
-    /**
+    /** @deprecated renderscript is deprecated in J
      * Create a basic RenderScript context.
      *
      * @hide
@@ -944,7 +944,7 @@
         return rs;
     }
 
-    /**
+    /** @deprecated renderscript is deprecated in J
      * Create a basic RenderScript context.
      *
      * @param ctx The context.
@@ -955,7 +955,7 @@
         return create(ctx, v);
     }
 
-    /**
+    /** @deprecated renderscript is deprecated in J
      * Print the currently available debugging information about the state of
      * the RS context to the log.
      *
@@ -965,7 +965,7 @@
         nContextDump(0);
     }
 
-    /**
+    /** @deprecated renderscript is deprecated in J
      * Wait for any commands in the fifo between the java bindings and native to
      * be processed.
      *
@@ -974,7 +974,7 @@
         nContextFinish();
     }
 
-    /**
+    /** @deprecated renderscript is deprecated in J
      * Destroy this renderscript context.  Once this function is called its no
      * longer legal to use this or any objects created by this context.
      *
diff --git a/graphics/java/android/renderscript/RenderScriptGL.java b/graphics/java/android/renderscript/RenderScriptGL.java
index 1b2ac90..ac1a392 100644
--- a/graphics/java/android/renderscript/RenderScriptGL.java
+++ b/graphics/java/android/renderscript/RenderScriptGL.java
@@ -28,7 +28,7 @@
 import android.view.SurfaceHolder;
 import android.view.SurfaceView;
 
-/**
+/** @deprecated renderscript is deprecated in J
  * The Graphics derivitive of Renderscript.  Extends the basic context to add a
  * root script which is the display window for graphical output.  When the
  * system needs to update the display the currently bound root script will be
@@ -45,7 +45,7 @@
     int mWidth;
     int mHeight;
 
-    /**
+    /** @deprecated renderscript is deprecated in J
      * Class which is used to describe a pixel format for a graphical buffer.
      * This is used to describe the intended format of the display surface.
      *
@@ -92,7 +92,7 @@
             }
         }
 
-        /**
+        /** @deprecated renderscript is deprecated in J
          * Set the per-component bit depth for color (red, green, blue).  This
          * configures the surface for an unsigned integer buffer type.
          *
@@ -105,7 +105,7 @@
             mColorPref = preferred;
         }
 
-        /**
+        /** @deprecated renderscript is deprecated in J
          * Set the bit depth for alpha. This configures the surface for
          * an unsigned integer buffer type.
          *
@@ -118,7 +118,7 @@
             mAlphaPref = preferred;
         }
 
-         /**
+         /** @deprecated renderscript is deprecated in J
          * Set the bit depth for the depth buffer. This configures the
          * surface for an unsigned integer buffer type.  If a minimum of 0
          * is specified then its possible no depth buffer will be
@@ -133,7 +133,7 @@
             mDepthPref = preferred;
         }
 
-        /**
+        /** @deprecated renderscript is deprecated in J
          * Configure the multisample rendering.
          *
          * @param minimum The required number of samples, must be at least 1.
@@ -156,7 +156,7 @@
 
     SurfaceConfig mSurfaceConfig;
 
-    /**
+    /** @deprecated renderscript is deprecated in J
      * Construct a new RenderScriptGL context.
      *
      * @param ctx The context.
@@ -186,7 +186,7 @@
         mMessageThread.start();
     }
 
-    /**
+    /** @deprecated renderscript is deprecated in J
      * Bind an os surface
      *
      *
@@ -205,7 +205,7 @@
         nContextSetSurface(w, h, s);
     }
 
-    /**
+    /** @deprecated renderscript is deprecated in J
      * Bind an os surface
      *
      * @param w
@@ -221,7 +221,7 @@
         nContextSetSurfaceTexture(w, h, sur);
     }
 
-    /**
+    /** @deprecated renderscript is deprecated in J
      * return the height of the last set surface.
      *
      * @return int
@@ -230,7 +230,7 @@
         return mHeight;
     }
 
-    /**
+    /** @deprecated renderscript is deprecated in J
      * return the width of the last set surface.
      *
      * @return int
@@ -239,7 +239,7 @@
         return mWidth;
     }
 
-    /**
+    /** @deprecated renderscript is deprecated in J
      * Temporarly halt calls to the root rendering script.
      *
      */
@@ -248,7 +248,7 @@
         nContextPause();
     }
 
-    /**
+    /** @deprecated renderscript is deprecated in J
      * Resume calls to the root rendering script.
      *
      */
@@ -258,7 +258,7 @@
     }
 
 
-    /**
+    /** @deprecated renderscript is deprecated in J
      * Set the script to handle calls to render the primary surface.
      *
      * @param s Graphics script to process rendering requests.
@@ -268,7 +268,7 @@
         nContextBindRootScript(safeID(s));
     }
 
-    /**
+    /** @deprecated renderscript is deprecated in J
      * Set the default ProgramStore object seen as the parent state by the root
      * rendering script.
      *
@@ -279,7 +279,7 @@
         nContextBindProgramStore(safeID(p));
     }
 
-    /**
+    /** @deprecated renderscript is deprecated in J
      * Set the default ProgramFragment object seen as the parent state by the
      * root rendering script.
      *
@@ -290,7 +290,7 @@
         nContextBindProgramFragment(safeID(p));
     }
 
-    /**
+    /** @deprecated renderscript is deprecated in J
      * Set the default ProgramRaster object seen as the parent state by the
      * root rendering script.
      *
@@ -301,7 +301,7 @@
         nContextBindProgramRaster(safeID(p));
     }
 
-    /**
+    /** @deprecated renderscript is deprecated in J
      * Set the default ProgramVertex object seen as the parent state by the
      * root rendering script.
      *
diff --git a/graphics/java/android/renderscript/Sampler.java b/graphics/java/android/renderscript/Sampler.java
index 0df1012..6b258ab 100644
--- a/graphics/java/android/renderscript/Sampler.java
+++ b/graphics/java/android/renderscript/Sampler.java
@@ -27,18 +27,32 @@
 import android.graphics.Bitmap;
 import android.graphics.BitmapFactory;
 
-/**
+/** @deprecated renderscript is deprecated in J
  * Sampler object which defines how data is extracted from textures. Samplers
  * are attached to Program objects (currently only ProgramFragment) when those objects
  * need to access texture data.
  **/
 public class Sampler extends BaseObj {
+    /** @deprecated renderscript is deprecated in J
+    */
     public enum Value {
+        /** @deprecated renderscript is deprecated in J
+        */
         NEAREST (0),
+        /** @deprecated renderscript is deprecated in J
+        */
         LINEAR (1),
+        /** @deprecated renderscript is deprecated in J
+        */
         LINEAR_MIP_LINEAR (2),
+        /** @deprecated renderscript is deprecated in J
+        */
         LINEAR_MIP_NEAREST (5),
+        /** @deprecated renderscript is deprecated in J
+        */
         WRAP (3),
+        /** @deprecated renderscript is deprecated in J
+        */
         CLAMP (4);
 
         int mID;
@@ -58,42 +72,42 @@
         super(id, rs);
     }
 
-    /**
+    /** @hide renderscript is deprecated in J
      * @return minification setting for the sampler
      */
     public Value getMinification() {
         return mMin;
     }
 
-    /**
+    /** @hide renderscript is deprecated in J
      * @return magnification setting for the sampler
      */
     public Value getMagnification() {
         return mMag;
     }
 
-    /**
+    /** @hide renderscript is deprecated in J
      * @return S wrapping mode for the sampler
      */
     public Value getWrapS() {
         return mWrapS;
     }
 
-    /**
+    /** @hide renderscript is deprecated in J
      * @return T wrapping mode for the sampler
      */
     public Value getWrapT() {
         return mWrapT;
     }
 
-    /**
+    /** @hide renderscript is deprecated in J
      * @return anisotropy setting for the sampler
      */
     public float getAnisotropy() {
         return mAniso;
     }
 
-    /**
+    /** @deprecated renderscript is deprecated in J
      * Retrieve a sampler with min and mag set to nearest and wrap modes set to
      * clamp.
      *
@@ -113,7 +127,7 @@
         return rs.mSampler_CLAMP_NEAREST;
     }
 
-    /**
+    /** @deprecated renderscript is deprecated in J
      * Retrieve a sampler with min and mag set to linear and wrap modes set to
      * clamp.
      *
@@ -133,7 +147,7 @@
         return rs.mSampler_CLAMP_LINEAR;
     }
 
-    /**
+    /** @deprecated renderscript is deprecated in J
      * Retrieve a sampler with ag set to linear, min linear mipmap linear, and
      * to and wrap modes set to clamp.
      *
@@ -153,7 +167,7 @@
         return rs.mSampler_CLAMP_LINEAR_MIP_LINEAR;
     }
 
-    /**
+    /** @deprecated renderscript is deprecated in J
      * Retrieve a sampler with min and mag set to nearest and wrap modes set to
      * wrap.
      *
@@ -173,7 +187,7 @@
         return rs.mSampler_WRAP_NEAREST;
     }
 
-    /**
+    /** @deprecated renderscript is deprecated in J
      * Retrieve a sampler with min and mag set to nearest and wrap modes set to
      * wrap.
      *
@@ -193,7 +207,7 @@
         return rs.mSampler_WRAP_LINEAR;
     }
 
-    /**
+    /** @deprecated renderscript is deprecated in J
      * Retrieve a sampler with ag set to linear, min linear mipmap linear, and
      * to and wrap modes set to wrap.
      *
@@ -214,7 +228,7 @@
     }
 
 
-    /**
+    /** @deprecated renderscript is deprecated in J
      * Builder for creating non-standard samplers.  Usefull if mix and match of
      * wrap modes is necesary or if anisotropic filtering is desired.
      *
diff --git a/graphics/java/android/renderscript/Script.java b/graphics/java/android/renderscript/Script.java
index 4f59ae3..34d33a9 100644
--- a/graphics/java/android/renderscript/Script.java
+++ b/graphics/java/android/renderscript/Script.java
@@ -16,11 +16,11 @@
 
 package android.renderscript;
 
-/**
+/** @deprecated renderscript is deprecated in J
  *
  **/
 public class Script extends BaseObj {
-    /**
+    /** @deprecated renderscript is deprecated in J
      * Only intended for use by generated reflected code.
      *
      * @param slot
@@ -29,7 +29,7 @@
         mRS.nScriptInvoke(getID(mRS), slot);
     }
 
-    /**
+    /** @deprecated renderscript is deprecated in J
      * Only intended for use by generated reflected code.
      *
      * @param slot
@@ -43,7 +43,7 @@
         }
     }
 
-    /**
+    /** @deprecated renderscript is deprecated in J
      * Only intended for use by generated reflected code.
      *
      * @param slot
@@ -77,7 +77,7 @@
     }
 
 
-    /**
+    /** @deprecated renderscript is deprecated in J
      * Only intended for use by generated reflected code.
      *
      * @param va
@@ -92,7 +92,7 @@
         }
     }
 
-    /**
+    /** @deprecated renderscript is deprecated in J
      * Only intended for use by generated reflected code.
      *
      * @param index
@@ -102,7 +102,7 @@
         mRS.nScriptSetVarF(getID(mRS), index, v);
     }
 
-    /**
+    /** @deprecated renderscript is deprecated in J
      * Only intended for use by generated reflected code.
      *
      * @param index
@@ -112,7 +112,7 @@
         mRS.nScriptSetVarD(getID(mRS), index, v);
     }
 
-    /**
+    /** @deprecated renderscript is deprecated in J
      * Only intended for use by generated reflected code.
      *
      * @param index
@@ -122,7 +122,7 @@
         mRS.nScriptSetVarI(getID(mRS), index, v);
     }
 
-    /**
+    /** @deprecated renderscript is deprecated in J
      * Only intended for use by generated reflected code.
      *
      * @param index
@@ -132,7 +132,7 @@
         mRS.nScriptSetVarJ(getID(mRS), index, v);
     }
 
-    /**
+    /** @deprecated renderscript is deprecated in J
      * Only intended for use by generated reflected code.
      *
      * @param index
@@ -142,7 +142,7 @@
         mRS.nScriptSetVarI(getID(mRS), index, v ? 1 : 0);
     }
 
-    /**
+    /** @deprecated renderscript is deprecated in J
      * Only intended for use by generated reflected code.
      *
      * @param index
@@ -152,7 +152,7 @@
         mRS.nScriptSetVarObj(getID(mRS), index, (o == null) ? 0 : o.getID(mRS));
     }
 
-    /**
+    /** @deprecated renderscript is deprecated in J
      * Only intended for use by generated reflected code.
      *
      * @param index
@@ -162,6 +162,8 @@
         mRS.nScriptSetVarV(getID(mRS), index, v.getData());
     }
 
+    /** @deprecated renderscript is deprecated in J
+    */
     public void setTimeZone(String timeZone) {
         mRS.validate();
         try {
diff --git a/graphics/java/android/renderscript/ScriptC.java b/graphics/java/android/renderscript/ScriptC.java
index 108b230..b1d1fa5 100644
--- a/graphics/java/android/renderscript/ScriptC.java
+++ b/graphics/java/android/renderscript/ScriptC.java
@@ -29,13 +29,13 @@
 import java.lang.reflect.Field;
 import java.lang.reflect.Modifier;
 
-/**
+/** @deprecated renderscript is deprecated in J
  *
  **/
 public class ScriptC extends Script {
     private static final String TAG = "ScriptC";
 
-    /**
+    /** @deprecated renderscript is deprecated in J
      * Only intended for use by the generated derived classes.
      *
      * @param id
@@ -45,7 +45,7 @@
         super(id, rs);
     }
 
-    /**
+    /** @deprecated renderscript is deprecated in J
      * Only intended for use by the generated derived classes.
      *
      *
diff --git a/graphics/java/android/renderscript/Short2.java b/graphics/java/android/renderscript/Short2.java
index 617f1f5..21c5f05 100644
--- a/graphics/java/android/renderscript/Short2.java
+++ b/graphics/java/android/renderscript/Short2.java
@@ -20,7 +20,7 @@
 import android.util.Log;
 
 
-/**
+/** @deprecated renderscript is deprecated in J
  * Class for exposing the native Renderscript Short2 type back to the Android system.
  *
  **/
diff --git a/graphics/java/android/renderscript/Short3.java b/graphics/java/android/renderscript/Short3.java
index b9ca49b..81a2954 100644
--- a/graphics/java/android/renderscript/Short3.java
+++ b/graphics/java/android/renderscript/Short3.java
@@ -20,7 +20,7 @@
 import android.util.Log;
 
 
-/**
+/** @deprecated renderscript is deprecated in J
  * Class for exposing the native Renderscript short3 type back to the Android system.
  *
  **/
diff --git a/graphics/java/android/renderscript/Short4.java b/graphics/java/android/renderscript/Short4.java
index d5f2db5..861c3d7 100644
--- a/graphics/java/android/renderscript/Short4.java
+++ b/graphics/java/android/renderscript/Short4.java
@@ -20,7 +20,7 @@
 import android.util.Log;
 
 
-/**
+/** @deprecated renderscript is deprecated in J
  * Class for exposing the native Renderscript short4 type back to the Android system.
  *
  **/
diff --git a/graphics/java/android/renderscript/Type.java b/graphics/java/android/renderscript/Type.java
index a707df2..9f630e7 100644
--- a/graphics/java/android/renderscript/Type.java
+++ b/graphics/java/android/renderscript/Type.java
@@ -20,7 +20,7 @@
 import java.lang.reflect.Field;
 import android.util.Log;
 
-/**
+/** @deprecated renderscript is deprecated in J
  * <p>Type is an allocation template. It consists of an Element and one or more
  * dimensions. It describes only the layout of memory but does not allocate any
  * storage for the data that is described.</p>
@@ -70,7 +70,7 @@
         }
     }
 
-    /**
+    /** @deprecated renderscript is deprecated in J
      * Return the element associated with this Type.
      *
      * @return Element
@@ -79,7 +79,7 @@
         return mElement;
     }
 
-    /**
+    /** @deprecated renderscript is deprecated in J
      * Return the value of the X dimension.
      *
      * @return int
@@ -88,7 +88,7 @@
         return mDimX;
     }
 
-    /**
+    /** @deprecated renderscript is deprecated in J
      * Return the value of the Y dimension or 0 for a 1D allocation.
      *
      * @return int
@@ -97,7 +97,7 @@
         return mDimY;
     }
 
-    /**
+    /** @deprecated renderscript is deprecated in J
      * Return the value of the Z dimension or 0 for a 1D or 2D allocation.
      *
      * @return int
@@ -106,7 +106,7 @@
         return mDimZ;
     }
 
-    /**
+    /** @deprecated renderscript is deprecated in J
      * Return if the Type has a mipmap chain.
      *
      * @return boolean
@@ -115,7 +115,7 @@
         return mDimMipmaps;
     }
 
-    /**
+    /** @deprecated renderscript is deprecated in J
      * Return if the Type is a cube map.
      *
      * @return boolean
@@ -124,7 +124,7 @@
         return mDimFaces;
     }
 
-    /**
+    /** @deprecated renderscript is deprecated in J
      * Return the total number of accessable cells in the Type.
      *
      * @return int
@@ -196,7 +196,7 @@
         calcElementCount();
     }
 
-    /**
+    /** @deprecated renderscript is deprecated in J
      * Builder class for Type.
      *
      */
@@ -210,7 +210,7 @@
 
         Element mElement;
 
-        /**
+        /** @deprecated renderscript is deprecated in J
          * Create a new builder object.
          *
          * @param rs
@@ -222,7 +222,7 @@
             mElement = e;
         }
 
-        /**
+        /** @deprecated renderscript is deprecated in J
          * Add a dimension to the Type.
          *
          *
@@ -255,7 +255,7 @@
         }
 
 
-        /**
+        /** @deprecated renderscript is deprecated in J
          * Validate structure and create a new type.
          *
          * @return Type