summaryrefslogtreecommitdiff
path: root/opengl/tests/gl_basic/gl_basic.cpp
diff options
context:
space:
mode:
authorHung-ying Tyan <tyanh@google.com>2010-10-21 10:55:33 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2010-10-21 10:55:33 -0700
commit5f771815d78e033128c853be2c668d51bfc1fdf4 (patch)
tree098417931546946efcd3ae0cd964b2d743dc5d89 /opengl/tests/gl_basic/gl_basic.cpp
parentd59a6d9ff6e576f54eed95e4aa93c2f00d0c3826 (diff)
parent91459a151fddb67fa424ab89e5f8440322892c9a (diff)
am 51028569: am 1180f2a0: Merge "Remove ringtone API from SipAudioCall." into gingerbread
Merge commit '5102856947595cffc1cceb11b9e4c5baf70b2e82' * commit '5102856947595cffc1cceb11b9e4c5baf70b2e82': Remove ringtone API from SipAudioCall.
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions