diff options
| author | Robert Greenwalt <rgreenwalt@google.com> | 2013-11-13 16:27:56 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2013-11-13 16:27:56 -0800 |
| commit | ec9e8933effe1dcb6887f7dca1cc0d78e6107e38 (patch) | |
| tree | 5a7fcd4cbff9b2aae93d4223ffb43e3585f88869 /rs/java/android/renderscript/Program.java | |
| parent | 84f4ad807152b6266431144425f153c48db28696 (diff) | |
| parent | 3b9244b4b4d5008daa9763a169a751975c75cc54 (diff) | |
am 3b9244b4: Merge "Fix for the invalid Global Proxy Setting"
* commit '3b9244b4b4d5008daa9763a169a751975c75cc54':
Fix for the invalid Global Proxy Setting
Diffstat (limited to 'rs/java/android/renderscript/Program.java')
0 files changed, 0 insertions, 0 deletions