diff options
| author | Andreas Huber <andih@google.com> | 2011-03-22 08:48:58 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-03-22 08:48:58 -0700 |
| commit | 3da107288d5ae112073875ac10317def3c299818 (patch) | |
| tree | 416da0f618f1a75e979f4aeede6bf25eaa0d3a2d /graphics/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | f2c44a79d90096e5f0edf698e27d291d439f0138 (diff) | |
| parent | 453c0d5f16a09473b0653566973bf8b6a867cf79 (diff) | |
am 453c0d5f: Merge "DO NOT MERGE: Enable http-live support for https:// urls, fix a parsing issue." into honeycomb-mr1
* commit '453c0d5f16a09473b0653566973bf8b6a867cf79':
DO NOT MERGE: Enable http-live support for https:// urls, fix a parsing issue.
Diffstat (limited to 'graphics/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions