Miao Wang c02720316d resolved conflicts for merge of a1867fb0 to mnc-dev-plus-aosp ...

Change-Id: Id0266c63c98b4cb37f49eb2e0fb9a98cbc7ee1de

2015-06-30 23:35:23 -07:00

..

Allocation.java

am 5fd0e46d: am 34a63ba4: Merge "Ensure RenderScript tracing is always balanced via try/finally"

2015-06-04 19:00:29 +00:00

AllocationAdapter.java

…

BaseObj.java

…

Byte2.java

…

Byte3.java

…

Byte4.java

…

Double2.java

…

Double3.java

…

Double4.java

…

Element.java

Fix issues found during CTS testing of FP16

2015-05-13 17:02:36 -07:00

FieldPacker.java

…

FileA3D.java

…

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

…

package.html

…

Program.java

…

ProgramFragment.java

…

ProgramFragmentFixedFunction.java

…

ProgramRaster.java

…

ProgramStore.java

…

ProgramVertex.java

…

ProgramVertexFixedFunction.java

…

RenderScript.java

am 95e31ac8: am 3385b616: Merge "Added in flag to ask context to wait for debugger attach."

2015-05-21 16:50:01 +00:00

RenderScriptCacheDir.java

…

RenderScriptGL.java

…

RSDriverException.java

…

RSIllegalArgumentException.java

…

RSInvalidStateException.java

…

RSRuntimeException.java

…

RSSurfaceView.java

…

RSTextureView.java

…

Sampler.java

…

Script.java

…

ScriptC.java

…

ScriptGroup.java

Add Java doc comments on script group name reuse

2015-06-29 15:38:25 -07:00

ScriptIntrinsic3DLUT.java

…

ScriptIntrinsic.java

…

ScriptIntrinsicBLAS.java

resolved conflicts for merge of a1867fb0 to mnc-dev-plus-aosp

2015-06-30 23:35:23 -07:00

ScriptIntrinsicBlend.java

add comment about xor not being porter/duff

2015-06-30 19:53:41 +00:00

ScriptIntrinsicBlur.java

…

ScriptIntrinsicColorMatrix.java

…

ScriptIntrinsicConvolve3x3.java

…

ScriptIntrinsicConvolve5x5.java

…

ScriptIntrinsicHistogram.java

…

ScriptIntrinsicLUT.java

…

ScriptIntrinsicResize.java

…

ScriptIntrinsicYuvToRGB.java

…

Short2.java

…

Short3.java

…

Short4.java

…

Type.java

…