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