summaryrefslogtreecommitdiffstats
path: root/rs/java/android/renderscript/RenderScript.java
diff options
context:
space:
mode:
authorDirk Dougherty <ddougherty@google.com>2015-04-14 05:03:13 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2015-04-14 05:03:13 +0000
commit38544901e6aa6934b032303be314a92dcde662f3 (patch)
tree12163b679bb701f858aec62569d1f97fe501f4bf /rs/java/android/renderscript/RenderScript.java
parent9426ad32bcdc2bf80491e7c170d9b6ef66f0ca89 (diff)
parentf2a57c69d4af3f7b1368e6edb6801b1cf2058dd8 (diff)
downloadframeworks_base-38544901e6aa6934b032303be314a92dcde662f3.zip
frameworks_base-38544901e6aa6934b032303be314a92dcde662f3.tar.gz
frameworks_base-38544901e6aa6934b032303be314a92dcde662f3.tar.bz2
am f2a57c69: am cda895c5: am c578bff7: am a80fc040: am 00f857c5: Merge "Doc change: add new pages for Designed for Families." into lmp-docs
* commit 'f2a57c69d4af3f7b1368e6edb6801b1cf2058dd8': Doc change: add new pages for Designed for Families.
Diffstat (limited to 'rs/java/android/renderscript/RenderScript.java')
0 files changed, 0 insertions, 0 deletions