summaryrefslogtreecommitdiff
path: root/opengl/tests/gl_basic/gl_basic.cpp
diff options
context:
space:
mode:
authorDianne Hackborn <hackbod@google.com>2010-04-02 13:39:11 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2010-04-02 13:39:11 -0700
commitb64822a3caa1f5edf0556cd20d60aad453f932e5 (patch)
treecdbf9768a271b0e0c930e042bbf7359082ffb896 /opengl/tests/gl_basic/gl_basic.cpp
parent65e79b2e6bd6feb3ac748cb4408a72af92b9e846 (diff)
parentf57216f124360587f6debf279e0a28e8d732b09c (diff)
am e13beb09: Merge "Add a new intent category used for activities running in carmode." into froyo
Merge commit 'e13beb09dadfba4806e6784bc7cde1466eb54ca4' into froyo-plus-aosp * commit 'e13beb09dadfba4806e6784bc7cde1466eb54ca4': Add a new intent category used for activities running in carmode.
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions