summaryrefslogtreecommitdiff
path: root/rs/java/android/renderscript/RenderScript.java
diff options
context:
space:
mode:
authorJoe Fernandez <joefernandez@google.com>2015-03-03 01:30:34 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2015-03-03 01:30:34 +0000
commit533fce68b3772b3b17b2df2ee6f698c591985397 (patch)
treedc4a21d6c5bfbeed9c191bd8c9891180370eb1a9 /rs/java/android/renderscript/RenderScript.java
parentc66f3baa42b8a732952abf1967c68f77d3e26131 (diff)
parent882a7fd40ed5704a59f49b4d97d9600a4e30db46 (diff)
am 882a7fd4: am 5c98dde7: am 46c588b9: am 5c6476aa: Merge "docs: Android 5.1 API Release notes (Lollipop MR1)" into lmp-mr1-dev
* commit '882a7fd40ed5704a59f49b4d97d9600a4e30db46': 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