diff options
| author | Brian Carlstrom <bdc@google.com> | 2014-08-04 18:32:59 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-08-04 18:32:59 +0000 |
| commit | 5a9b135f983aa080fccbff29a328d1fc231d7e4a (patch) | |
| tree | 60366aa9fa10e0404c47b3be30ce035b297aae03 /rs/java/android/renderscript/RenderScript.java | |
| parent | bccea16ec1dc0d91750dc2b6932c4d370b365b2a (diff) | |
| parent | 20bac14e521dd551addd8541380f1d9b6c910bd2 (diff) | |
am 20bac14e: Merge changes I69c064b0,I1972c5af
* commit '20bac14e521dd551addd8541380f1d9b6c910bd2':
Move image classes options from art to AndroidRuntime [frameworks/base]
Disable compilation based on vold.decrypt. [frameworks/base]
Diffstat (limited to 'rs/java/android/renderscript/RenderScript.java')
0 files changed, 0 insertions, 0 deletions