Stephen Hines 4a043c1853 resolved conflicts for merge of 5a2d0432 to lmp-dev-plus-aosp ...

Change-Id: I59be35e67ab2b4709f27c39916b6aebc1abba56f

2014-08-21 23:20:32 -07:00

..

java/android/renderscript

am 7fa25bc1: am 3c02b020: Merge "Fix IO_INPUT with 64-bit." into lmp-dev

2014-08-19 21:07:42 +00:00

jni

resolved conflicts for merge of 5a2d0432 to lmp-dev-plus-aosp

2014-08-21 23:20:32 -07:00