diff options
| author | Robert Greenwalt <rgreenwalt@google.com> | 2013-04-09 18:15:06 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2013-04-09 18:15:06 +0000 |
| commit | dbf500aaafd0889aa3ac9bf0fb2b2be4e0c3ebbf (patch) | |
| tree | a55d227eb9888e9f63d65029e1437e01fd96ce6d /graphics/java/android/renderscript/RenderScript.java | |
| parent | b4c13c4b045f4d96c377ba1fb9d834c111412a8c (diff) | |
| parent | 00e8d4c1b69997f63542cff5698c358d494a8d9f (diff) | |
Merge "Turn back on global proxy support." into jb-mr2-dev
Diffstat (limited to 'graphics/java/android/renderscript/RenderScript.java')
0 files changed, 0 insertions, 0 deletions