diff options
| author | Andreas Huber <andih@google.com> | 2011-02-16 09:23:11 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-02-16 09:23:11 -0800 |
| commit | 65e53c664f4691e67a8bca7b9049b2d6a3178ede (patch) | |
| tree | 9e1f6162da1876d492023c69d6f2bf453ba5d1e6 /graphics/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | b4242275095da96fe37176c13ee44ac3dd83dc3e (diff) | |
| parent | 0bbf96675783758b6ffdff8996d7166ae1dec15b (diff) | |
am 0bbf9667: (-s ours) am 16d94f58: (-s ours) am 8db7a7bf: Merge "DO NOT MERGE: Derive the Transport "source" attribute from the RTSP endpoint address if necessary" into gingerbread
* commit '0bbf96675783758b6ffdff8996d7166ae1dec15b':
DO NOT MERGE: Derive the Transport "source" attribute from the RTSP endpoint address if necessary
Diffstat (limited to 'graphics/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions