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