summaryrefslogtreecommitdiff
path: root/rs/java/android/renderscript/RenderScript.java
diff options
context:
space:
mode:
authorJoe Fernandez <joefernandez@google.com>2015-03-03 01:06:10 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2015-03-03 01:06:10 +0000
commit46c588b9394128a2da2c0ce3cea4eef05cea0f12 (patch)
treed2aa36c851e4d7dc46955231a9aadbc59406215b /rs/java/android/renderscript/RenderScript.java
parent20a5df6205c3d57bfcb5b8e1454fb88c638c8ae3 (diff)
parent5c6476aa507577422557d8434a7ce19937cfccfd (diff)
am 5c6476aa: Merge "docs: Android 5.1 API Release notes (Lollipop MR1)" into lmp-mr1-dev
* commit '5c6476aa507577422557d8434a7ce19937cfccfd': docs: Android 5.1 API Release notes (Lollipop MR1)
Diffstat (limited to 'rs/java/android/renderscript/RenderScript.java')
0 files changed, 0 insertions, 0 deletions