summaryrefslogtreecommitdiff
path: root/opengl/tests/gl_basic/gl_basic.cpp
diff options
context:
space:
mode:
authorrepo sync . build/envsetup.sh lunch passion-en <clchen@google.com>2010-09-27 17:51:45 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2010-09-27 17:51:45 -0700
commit0bf2a8bd671c524037d7d559b12005df542af1ff (patch)
treef1f0e7831502036b3e854a76778f8c6ae8d6def6 /opengl/tests/gl_basic/gl_basic.cpp
parent915db0da4521814e1ec460be724281438b25fee7 (diff)
parent6e0e4c4f119a4370a33e0bae6e289cf1470be307 (diff)
am 4fc3d2f0: DO NOT MERGE
Merge commit '4fc3d2f0b3237390c37ccc4701bc68e4aa5f9b7a' into gingerbread-plus-aosp * commit '4fc3d2f0b3237390c37ccc4701bc68e4aa5f9b7a': DO NOT MERGE
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions