summaryrefslogtreecommitdiff
path: root/opengl/tests/gl_basic/gl_basic.cpp
diff options
context:
space:
mode:
authorHung-ying Tyan <tyanh@google.com>2010-10-01 15:56:02 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2010-10-01 15:56:02 -0700
commitbd434f9205e04d0e77963eee8a3523e5a050719c (patch)
tree75d47cdcbb7eadf0f96aa8203158ca157cc4a260 /opengl/tests/gl_basic/gl_basic.cpp
parent5f07bee4543a70fe305e79d048ad9e5ec4235d23 (diff)
parentaa2d67d4b750050f75eac73cdba6ed647cd8bfd2 (diff)
am 10e2120b: Merge "Add CallManager/Phone.setEchoSuppressionEnabled()." into gingerbread
Merge commit '10e2120bdd2d99e100db187d49ac6a8495c7f956' into gingerbread-plus-aosp * commit '10e2120bdd2d99e100db187d49ac6a8495c7f956': Add CallManager/Phone.setEchoSuppressionEnabled().
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions