diff options
| author | Irfan Sheriff <isheriff@google.com> | 2013-04-11 21:06:38 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2013-04-11 21:06:38 -0700 |
| commit | 01dfa121422a12d40c486c64f4fa44e7f1c0d7c0 (patch) | |
| tree | 4cd694f171beb8d1e49bc43967a00658f839b30a /graphics/java/android/renderscript/RenderScript.java | |
| parent | 5a1513657269c65ca9e25fe9dc203491efd83ea4 (diff) | |
| parent | c7512057feed983cf0eeb87f02f73426bfef5336 (diff) | |
am c7512057: am 5f2f3dfe: Merge "Fix proxy and IP settings" into jb-mr2-dev
* commit 'c7512057feed983cf0eeb87f02f73426bfef5336':
Fix proxy and IP settings
Diffstat (limited to 'graphics/java/android/renderscript/RenderScript.java')
0 files changed, 0 insertions, 0 deletions