diff options
| author | Andreas Huber <andih@google.com> | 2011-02-16 09:10:19 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-02-16 09:10:19 -0800 |
| commit | 0bbf96675783758b6ffdff8996d7166ae1dec15b (patch) | |
| tree | 6d535d4f6572ce9e19c90caeac363b58c92569cf /graphics/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | e131ccb615172e317501f721c30b152823c566bf (diff) | |
| parent | 16d94f580a50dafbe4dda3e9fe2ef47897ac1fe5 (diff) | |
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 '16d94f580a50dafbe4dda3e9fe2ef47897ac1fe5':
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