diff options
| author | Andreas Huber <andih@google.com> | 2010-09-27 09:28:06 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-09-27 09:28:06 -0700 |
| commit | a54abd06d2a5ce3f2773fbd749b6eab035df4857 (patch) | |
| tree | 349183317ec7d416859c470b338f7d8d9df0afc5 /graphics/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 5e18ad0c53faf88357c83bae66ab9d04c0388bb9 (diff) | |
| parent | fa5c8fc4a48fab5c5c612bd4eed6ea9c568f6afc (diff) | |
am fa5c8fc4: am abaabb2c: Merge "Support other kinds of HTTP redirect in NuHTTPDataSource" into gingerbread
Merge commit 'fa5c8fc4a48fab5c5c612bd4eed6ea9c568f6afc'
* commit 'fa5c8fc4a48fab5c5c612bd4eed6ea9c568f6afc':
Support other kinds of HTTP redirect in NuHTTPDataSource
Diffstat (limited to 'graphics/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions