summaryrefslogtreecommitdiff
path: root/opengl/tests/gl_basic/gl_basic.cpp
diff options
context:
space:
mode:
authorHung-ying Tyan <tyanh@google.com>2010-10-20 11:49:26 -0700
committerAndroid (Google) Code Review <android-gerrit@google.com>2010-10-20 11:49:26 -0700
commita6484519451bffa0ff88dbaee3a1a3175dd876ae (patch)
tree2be6180be2c505895805cf583c10f2640c03b8af /opengl/tests/gl_basic/gl_basic.cpp
parent2a9c6d09136a3d89b14cbfaaf9dcb58edc84cf7b (diff)
Merge "Silently reject a ringing call when another call is dialing/ringing." into gingerbread
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions