summaryrefslogtreecommitdiff
path: root/opengl/tests/gl_basic/gl_basic.cpp
diff options
context:
space:
mode:
authorChia-chi Yeh <chiachi@android.com>2010-08-25 19:46:04 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2010-08-25 19:46:04 -0700
commit82d6e71fad35e58f8152a15d1c93aee658f4755b (patch)
tree1ab9fec699641f5be0d4ba9dd2c5d44fd21b0bd0 /opengl/tests/gl_basic/gl_basic.cpp
parent7a2b14a682abd56a1e596098f4e480093cffa3dc (diff)
parent3898d53baa4376856c62938c57ebd99db35a05a9 (diff)
am 14e00621: Merge "Revert "RTP: integrate the echo canceller from speex."" into gingerbread
Merge commit '14e00621c81da6a0391da47afce77945b27c7231' into gingerbread-plus-aosp * commit '14e00621c81da6a0391da47afce77945b27c7231': 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