summaryrefslogtreecommitdiff
path: root/opengl/tests/gl_basic/gl_basic.cpp
diff options
context:
space:
mode:
authorJean-Baptiste Queru <jbq@google.com>2010-08-23 14:14:45 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2010-08-23 14:14:45 -0700
commit2e469b827d404c3f21c9fb1f1ab2a92c61df699e (patch)
tree85f48fd8e5576feecb15939f81e6af4bbe1942fc /opengl/tests/gl_basic/gl_basic.cpp
parentf9e75180b691db422a4d11f95b6fae4eb880ea92 (diff)
parent7eea71bf430cb451a0f0740c3533665eeee77564 (diff)
am 6864b3e2: Merge "Adds the ability to Android to initiate a 2 Digit Call."
Merge commit '6864b3e2f4e67be847b2ae054f2f9c388f115722' into gingerbread-plus-aosp * commit '6864b3e2f4e67be847b2ae054f2f9c388f115722': Adds the ability to Android to initiate a 2 Digit Call.
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions