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 | dd0630c837ad04718ce1482f559227e202dbc71d (patch) | |
| tree | 2de34eaf949bd30904e7e7343a64fce86fec4561 /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | 6443e1a39cf107b992b884415b60be20416c84d8 (diff) | |
| parent | d145fc17703352d8dea6b1f0ba4f29a0cc5c7ef7 (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 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions