summaryrefslogtreecommitdiff
path: root/rs/java/android/renderscript/RenderScript.java
diff options
context:
space:
mode:
authorRich Slogar <rslogar@google.com>2015-04-09 18:21:06 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2015-04-09 18:21:06 +0000
commita6b6952bb6aedf747e58055c120e98383e4491a3 (patch)
tree6d8216d3f1d14a55494b3a7cf4dd96bf16b99244 /rs/java/android/renderscript/RenderScript.java
parentfd1681513357309868c2659f215c931e4d27c40e (diff)
parent0b1610ff49b042df19fc9071f2811efb642f7df9 (diff)
am 0b1610ff: am 2489a7fd: am 9d6e9587: am 36e3f512: Merge "docs: remove studio proguard settings from play services" into lmp-docs
* commit '0b1610ff49b042df19fc9071f2811efb642f7df9': docs: remove studio proguard settings from play services
Diffstat (limited to 'rs/java/android/renderscript/RenderScript.java')
0 files changed, 0 insertions, 0 deletions