summaryrefslogtreecommitdiff
path: root/opengl/tests/gl_basic/gl_basic.cpp
diff options
context:
space:
mode:
authorChia-chi Yeh <chiachi@android.com>2010-09-30 19:47:49 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2010-09-30 19:47:49 -0700
commit4cb9d17461aba80373ed7a1c78ab46e03b9e9415 (patch)
tree69f33d22b47959c9522cfef749a5057131aa68f9 /opengl/tests/gl_basic/gl_basic.cpp
parent9102ed18cd69ac64c4daff10025db048d3beed20 (diff)
parent8b3f9d3a8bdfbf38f767917f3ac66767f120dfce (diff)
am c38e6ae4: am 274e3b5d: Merge "RTP: Start AudioRecord before AudioTrack to avoid being disabled." into gingerbread
Merge commit 'c38e6ae40096ec60bc42de663f39dc061b9c90f4' * commit 'c38e6ae40096ec60bc42de663f39dc061b9c90f4': RTP: Start AudioRecord before AudioTrack to avoid being disabled.
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions