Jason Sams afb02269cf Merge commit '1ccc6633' into manualmerge ...

Conflicts:
	graphics/java/android/renderscript/Double2.java
	graphics/java/android/renderscript/Double3.java
	graphics/java/android/renderscript/Double4.java
	graphics/java/android/renderscript/Float2.java
	graphics/java/android/renderscript/Float3.java
	graphics/java/android/renderscript/Float4.java
	graphics/java/android/renderscript/Int2.java
	graphics/java/android/renderscript/Int3.java
	graphics/java/android/renderscript/Int4.java
	graphics/java/android/renderscript/Long2.java
	graphics/java/android/renderscript/Long3.java
	graphics/java/android/renderscript/Long4.java
	graphics/java/android/renderscript/Short2.java
	graphics/java/android/renderscript/Short3.java
	graphics/java/android/renderscript/Short4.java

Change-Id: Ib9e940bc7d62764020eea7639d7158af707eb33f

2013-11-27 15:30:06 -08:00

..

Allocation.java

Fix sdk build.

2013-11-26 15:47:43 -08:00

AllocationAdapter.java

Merge "Convert Java/JNI to 64-bit, part 2."

2013-11-20 22:46:47 +00:00

BaseObj.java

Merge "Convert Java/JNI to 64-bit, part 2."

2013-11-20 22:46:47 +00:00

Byte2.java

Merge commit '1ccc6633' into manualmerge

2013-11-27 15:30:06 -08:00

Byte3.java

Merge commit '1ccc6633' into manualmerge

2013-11-27 15:30:06 -08:00

Byte4.java

Merge commit '1ccc6633' into manualmerge

2013-11-27 15:30:06 -08:00

Double2.java

Remove unused imports from frameworks/base.

2013-11-20 11:31:47 -05:00

Double3.java

Remove unused imports from frameworks/base.

2013-11-20 11:31:47 -05:00

Double4.java

Remove unused imports from frameworks/base.

2013-11-20 11:31:47 -05:00

Element.java

Merge "Convert Java/JNI to 64-bit, part 2."

2013-11-20 22:46:47 +00:00

FieldPacker.java

Merge "Convert Java/JNI to 64-bit, part 2."

2013-11-20 22:46:47 +00:00

FileA3D.java

Merge "Convert Java/JNI to 64-bit, part 2."

2013-11-20 22:46:47 +00:00

Float2.java

Merge commit '1ccc6633' into manualmerge

2013-11-27 15:30:06 -08:00

Float3.java

Remove unused imports from frameworks/base.

2013-11-20 11:31:47 -05:00

Float4.java

Remove unused imports from frameworks/base.

2013-11-20 11:31:47 -05:00

Font.java

Remove unused imports from frameworks/base.

2013-11-20 11:31:47 -05:00

Int2.java

Remove unused imports from frameworks/base.

2013-11-20 11:31:47 -05:00

Int3.java

Merge commit '1ccc6633' into manualmerge

2013-11-27 15:30:06 -08:00

Int4.java

Remove unused imports from frameworks/base.

2013-11-20 11:31:47 -05:00

Long2.java

Remove unused imports from frameworks/base.

2013-11-20 11:31:47 -05:00

Long3.java

Merge commit '1ccc6633' into manualmerge

2013-11-27 15:30:06 -08:00

Long4.java

Remove unused imports from frameworks/base.

2013-11-20 11:31:47 -05:00

Matrix2f.java

Remove unused imports from frameworks/base.

2013-11-20 11:31:47 -05:00

Matrix3f.java

Remove unused imports from frameworks/base.

2013-11-20 11:31:47 -05:00

Matrix4f.java

Remove unused imports from frameworks/base.

2013-11-20 11:31:47 -05:00

Mesh.java

Merge "Convert Java/JNI to 64-bit, part 2."

2013-11-20 22:46:47 +00:00

package.html

…

Path.java

Merge "Convert Java/JNI to 64-bit, part 2."

2013-11-20 22:46:47 +00:00

Program.java

Convert Java/JNI to 64-bit, part 2.

2013-11-20 10:18:04 -08:00

ProgramFragment.java

Merge "Convert Java/JNI to 64-bit, part 2."

2013-11-20 22:46:47 +00:00

ProgramFragmentFixedFunction.java

Merge "Convert Java/JNI to 64-bit, part 2."

2013-11-20 22:46:47 +00:00

ProgramRaster.java

Merge "Convert Java/JNI to 64-bit, part 2."

2013-11-20 22:46:47 +00:00

ProgramStore.java

Remove unused imports from frameworks/base.

2013-11-20 11:31:47 -05:00

ProgramVertex.java

Merge "Convert Java/JNI to 64-bit, part 2."

2013-11-20 22:46:47 +00:00

ProgramVertexFixedFunction.java

Merge "Convert Java/JNI to 64-bit, part 2."

2013-11-20 22:46:47 +00:00

RenderScript.java

Merge "Convert Java/JNI to 64-bit, part 2."

2013-11-20 22:46:47 +00:00

RenderScriptGL.java

Merge "Convert Java/JNI to 64-bit, part 2."

2013-11-20 22:46:47 +00:00

RSDriverException.java

…

RSIllegalArgumentException.java

…

RSInvalidStateException.java

…

RSRuntimeException.java

…

RSSurfaceView.java

Remove unused imports from frameworks/base.

2013-11-20 11:31:47 -05:00

RSTextureView.java

Remove unused imports from frameworks/base.

2013-11-20 11:31:47 -05:00

Sampler.java

Remove unused imports from frameworks/base.

2013-11-20 11:31:47 -05:00

Script.java

Convert Java/JNI to 64-bit, part 2.

2013-11-20 10:18:04 -08:00

ScriptC.java

Remove unused imports from frameworks/base.

2013-11-20 11:31:47 -05:00

ScriptGroup.java

Merge "Convert Java/JNI to 64-bit, part 2."

2013-11-20 22:46:47 +00:00

ScriptIntrinsic3DLUT.java

Merge "Convert Java/JNI to 64-bit, part 2."

2013-11-20 22:46:47 +00:00

ScriptIntrinsic.java

Convert Java/JNI to 64-bit, part 2.

2013-11-20 10:18:04 -08:00

ScriptIntrinsicBlend.java

Convert Java/JNI to 64-bit, part 2.

2013-11-20 10:18:04 -08:00

ScriptIntrinsicBlur.java

Merge "Convert Java/JNI to 64-bit, part 2."

2013-11-20 22:46:47 +00:00

ScriptIntrinsicColorMatrix.java

Merge "Convert Java/JNI to 64-bit, part 2."

2013-11-20 22:46:47 +00:00

ScriptIntrinsicConvolve3x3.java

Merge "Convert Java/JNI to 64-bit, part 2."

2013-11-20 22:46:47 +00:00

ScriptIntrinsicConvolve5x5.java

Merge "Convert Java/JNI to 64-bit, part 2."

2013-11-20 22:46:47 +00:00

ScriptIntrinsicHistogram.java

Merge "Convert Java/JNI to 64-bit, part 2."

2013-11-20 22:46:47 +00:00

ScriptIntrinsicLUT.java

Merge "Convert Java/JNI to 64-bit, part 2."

2013-11-20 22:46:47 +00:00

ScriptIntrinsicYuvToRGB.java

Convert Java/JNI to 64-bit, part 2.

2013-11-20 10:18:04 -08:00

Short2.java

Merge commit '1ccc6633' into manualmerge

2013-11-27 15:30:06 -08:00

Short3.java

Remove unused imports from frameworks/base.

2013-11-20 11:31:47 -05:00

Short4.java

Remove unused imports from frameworks/base.

2013-11-20 11:31:47 -05:00

Type.java

Merge "Convert Java/JNI to 64-bit, part 2."

2013-11-20 22:46:47 +00:00