summaryrefslogtreecommitdiff
path: root/rs/java/android/renderscript/RenderScript.java
diff options
context:
space:
mode:
authorJoe Fernandez <joefernandez@google.com>2015-03-03 01:38:31 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2015-03-03 01:38:31 +0000
commit573c2f8d540be9b61dbd780ee89dbc68031d7531 (patch)
tree5eadf352190f6885401f182df4965821dd87c532 /rs/java/android/renderscript/RenderScript.java
parent533fce68b3772b3b17b2df2ee6f698c591985397 (diff)
parent0c53910308cb437d9b70395a492141181d943902 (diff)
am 0c539103: am aa1d2137: am be34916d: am 45ef73b4: Merge "docs: Add Android 5.1 to the uses-sdk manifest docs" into lmp-mr1-dev
* commit '0c53910308cb437d9b70395a492141181d943902': 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