diff options
| author | Andreas Huber <andih@google.com> | 2011-03-22 11:42:51 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-03-22 11:42:51 -0700 |
| commit | e50b799dc28c523c43d066d2f2a01747a52563c2 (patch) | |
| tree | f662844ab9608fd20dd07a67e9c287a3c0fa9cc1 /graphics/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | fdef2cb760de2798d9832a4aaa7d8cba1f32dfd1 (diff) | |
| parent | 71ba7d34bc1c900a872d5353e3f04c3751fa95f8 (diff) | |
am 71ba7d34: (-s ours) am 3da10728: am 453c0d5f: Merge "DO NOT MERGE: Enable http-live support for https:// urls, fix a parsing issue." into honeycomb-mr1
* commit '71ba7d34bc1c900a872d5353e3f04c3751fa95f8':
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