summaryrefslogtreecommitdiff
path: root/opengl/tests/gl_basic/gl_basic.cpp
diff options
context:
space:
mode:
authorJohn Wang <johnwang@google.com>2011-11-08 00:50:36 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2011-11-08 00:50:36 +0000
commit02c45c7a34c543cd100974320c777b9b0016bb8b (patch)
tree52c74bda18e5a4642fe968fa2e904ce3b222bfd6 /opengl/tests/gl_basic/gl_basic.cpp
parent46bb0a1cf687e77f7f7338cf74d5ae4897fda9b0 (diff)
parent2f99bb5e4f706fee3dc1e08bdd66f58ea9844b09 (diff)
am 2f99bb5e: Merge "Remain in call audio mode while phone is offhook." into ics-mr1
* commit '2f99bb5e4f706fee3dc1e08bdd66f58ea9844b09': Remain in call audio mode while phone is offhook.
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions