summaryrefslogtreecommitdiff
path: root/opengl/tests/gl_basic/gl_basic.cpp
diff options
context:
space:
mode:
authorEric Fischer <enf@google.com>2010-09-29 12:17:28 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2010-09-29 12:17:28 -0700
commit10276a4b471c8d4458e52c896b6a975f0ce8b5f6 (patch)
tree98c2aa54138fd908e08466ccfb8567ddb09e10bf /opengl/tests/gl_basic/gl_basic.cpp
parent6acfce816db5fac8b2b5ed6dfa17002c8f1af851 (diff)
parentc0e642476d2e30a276302e1da8b0f2f6b7960071 (diff)
am 5f0c8fe6: Merge "Split strings with SD card references into variations." into gingerbread
Merge commit '5f0c8fe6516ab2327f93f1c038d8854dbcbe7ce0' into gingerbread-plus-aosp * commit '5f0c8fe6516ab2327f93f1c038d8854dbcbe7ce0': Split strings with SD card references into variations.
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions