summaryrefslogtreecommitdiff
path: root/rs/java/android/renderscript/RenderScript.java
diff options
context:
space:
mode:
authorJoe Fernandez <joefernandez@google.com>2015-03-03 01:24:50 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2015-03-03 01:24:50 +0000
commitaa1d21379020440f173b58a9edf32381a999f7bf (patch)
treebaf0857e2e170648afb54afa28e22b699acd7a2e /rs/java/android/renderscript/RenderScript.java
parent5c98dde7911db8d6d1e1a5bc695b658ec8a62a95 (diff)
parentbe34916d448e9cd04bebfa5bf3d61de0c8087d65 (diff)
am be34916d: am 45ef73b4: Merge "docs: Add Android 5.1 to the uses-sdk manifest docs" into lmp-mr1-dev
* commit 'be34916d448e9cd04bebfa5bf3d61de0c8087d65': docs: Add Android 5.1 to the uses-sdk manifest docs
Diffstat (limited to 'rs/java/android/renderscript/RenderScript.java')
0 files changed, 0 insertions, 0 deletions