diff options
| author | Brian Carlstrom <bdc@google.com> | 2014-08-04 18:27:38 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2014-08-01 08:22:51 +0000 |
| commit | 20bac14e521dd551addd8541380f1d9b6c910bd2 (patch) | |
| tree | 6156d9616c8e00d8cc214bbcd5408745d3e26603 /rs/java/android/renderscript/RenderScript.java | |
| parent | 1de3c633dc1c355ee2356249e6309c5adf83c9a6 (diff) | |
| parent | 108166c749f0418d45f220419a9611c4afec1311 (diff) | |
Merge changes I69c064b0,I1972c5af
* changes:
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