summaryrefslogtreecommitdiff
path: root/opengl/tests/gl_basic/gl_basic.cpp
diff options
context:
space:
mode:
authorHung-ying Tyan <tyanh@google.com>2010-10-01 17:07:48 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2010-10-01 17:07:48 -0700
commit2455dce6a08012f0233dc0f3135939b30a223bbb (patch)
tree1f0d342cbed2ea50622e9a4e941d45ace6afca65 /opengl/tests/gl_basic/gl_basic.cpp
parent7960b17ab16a07cad93ce2439327f253cbb66fb0 (diff)
parentbd434f9205e04d0e77963eee8a3523e5a050719c (diff)
am 86a12d46: am 10e2120b: Merge "Add CallManager/Phone.setEchoSuppressionEnabled()." into gingerbread
Merge commit '86a12d465fca7d25d99a788abda33fde5154a739' * commit '86a12d465fca7d25d99a788abda33fde5154a739': Add CallManager/Phone.setEchoSuppressionEnabled().
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions