Elliott Hughes b57dd722f1 resolved conflicts for a884d81e to stage-aosp-master ...

Change-Id: Ice485967fa96f13786024b6939b826638e906ff0

2015-09-24 10:01:32 -07:00

..

java/android/renderscript

am ed3ffe0f: am 6430812a: Merge "RenderScript: implement a Script entry point for calling a reduce-style kernel."

2015-07-23 22:54:59 +00:00

jni

resolved conflicts for a884d81e to stage-aosp-master

2015-09-24 10:01:32 -07:00