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