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

Change-Id: I0a22225b2d26b6d806de2dcc70ffba29c96865b3

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

..

java/android/renderscript

resolved conflicts for merge of 764f08ad to master

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

jni

am 02dff422: am 5db6f1fa: am 63dde9c8: Merge "Fix value size data type in closure creation."

2015-04-01 02:19:41 +00:00