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