Stephen Hines b6b17a575f resolved conflicts for merge of 764f08ad to master ...

Change-Id: I0a22225b2d26b6d806de2dcc70ffba29c96865b3

2015-04-07 14:47:32 -07:00

..

Allocation.java

am 1327fa9e: am 511eb660: am 6aed9ec1: Merge "[RenderScript] update exception reporting for copyTo() after autoPadding added."

2015-04-03 18:18:01 +00:00

AllocationAdapter.java

unhide AllocationAdapter APIs

2015-03-20 15:09:35 -07:00

BaseObj.java

…

Byte2.java

…

Byte3.java

…

Byte4.java

…

Double2.java

…

Double3.java

…

Double4.java

…

Element.java

unhide RS apis

2015-03-30 15:31:26 -07:00

FieldPacker.java

Rewrote FieldPack::createFieldPack for alignment

2015-04-06 14:49:53 -07:00

FileA3D.java

Catch errors for unknown object types.

2015-03-26 15:29:56 -07:00

Float2.java

…

Float3.java

…

Float4.java

…

Font.java

…

Int2.java

…

Int3.java

…

Int4.java

…

Long2.java

…

Long3.java

…

Long4.java

…

Matrix2f.java

…

Matrix3f.java

…

Matrix4f.java

…

Mesh.java

Fix potential npe

2015-03-26 14:47:17 -07:00

package.html

…

Program.java

…

ProgramFragment.java

…

ProgramFragmentFixedFunction.java

…

ProgramRaster.java

…

ProgramStore.java

…

ProgramVertex.java

…

ProgramVertexFixedFunction.java

…

RenderScript.java

resolved conflicts for merge of 764f08ad to master

2015-04-07 14:47:32 -07:00

RenderScriptCacheDir.java

Move cache dir to its own class.

2015-04-07 13:24:14 -07:00

RenderScriptGL.java

…

RSDriverException.java

…

RSIllegalArgumentException.java

…

RSInvalidStateException.java

…

RSRuntimeException.java

…

RSSurfaceView.java

…

RSTextureView.java

…

Sampler.java

…

Script.java

Update LaunchOptions description

2015-03-30 17:01:10 -07:00

ScriptC.java

Move cache dir to its own class.

2015-04-07 13:24:14 -07:00

ScriptGroup2.java

Merge "Add a name to ScriptGroup2.Builder.create method"

2015-04-07 19:54:31 +00:00

ScriptGroup.java

…

ScriptIntrinsic3DLUT.java

…

ScriptIntrinsic.java

…

ScriptIntrinsicBLAS.java

…

ScriptIntrinsicBlend.java

…

ScriptIntrinsicBlur.java

Fix minor blur doc bug

2015-04-02 14:10:53 -07:00

ScriptIntrinsicColorMatrix.java

…

ScriptIntrinsicConvolve3x3.java

…

ScriptIntrinsicConvolve5x5.java

…

ScriptIntrinsicHistogram.java

…

ScriptIntrinsicLUT.java

…

ScriptIntrinsicResize.java

…

ScriptIntrinsicYuvToRGB.java

…

Short2.java

…

Short3.java

…

Short4.java

…

Type.java

unhide RS apis

2015-03-30 15:31:26 -07:00