summaryrefslogtreecommitdiff
path: root/opengl/tests/gl_basic/gl_basic.cpp
diff options
context:
space:
mode:
authorChia-chi Yeh <chiachi@android.com>2010-08-25 20:02:04 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2010-08-25 20:02:04 -0700
commit0b70da2cb33947a2f4b10b7bd6389a355d885472 (patch)
tree6ca310606cc8eca244bad34907fd7759836cb772 /opengl/tests/gl_basic/gl_basic.cpp
parentf29dcb9ca58ac3374c3e41736b0d4375a46a4182 (diff)
parent82d6e71fad35e58f8152a15d1c93aee658f4755b (diff)
am 91fe7464: am 14e00621: Merge "Revert "RTP: integrate the echo canceller from speex."" into gingerbread
Merge commit '91fe746437e1709b83b4eb4d113e5f435d7c6412' * commit '91fe746437e1709b83b4eb4d113e5f435d7c6412': Revert "RTP: integrate the echo canceller from speex."
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions