summaryrefslogtreecommitdiff
path: root/rs/java/android/renderscript/ScriptGroup2.java
diff options
context:
space:
mode:
authorSimon Wilson <simonwilson@google.com>2015-04-03 14:51:51 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2015-04-03 14:51:51 +0000
commit2c89469d5ca129227a829d297fca3db08d22c96c (patch)
tree8dafad06465dfd5b2663379c118a332de79988aa /rs/java/android/renderscript/ScriptGroup2.java
parent3370e446b136e0cafe42bdfcc0f2400b16e1eb4e (diff)
parentfd395ce7f33bda1e4ff72bebcc4c0b4e56b8232d (diff)
am fd395ce7: am d0077829: am fb397cf8: (-s ours) Merge "Frameworks/base: Support dex2oat threads system property" into lmp-mr1-modular-dev
* commit 'fd395ce7f33bda1e4ff72bebcc4c0b4e56b8232d': Frameworks/base: Support dex2oat threads system property
Diffstat (limited to 'rs/java/android/renderscript/ScriptGroup2.java')
0 files changed, 0 insertions, 0 deletions