summaryrefslogtreecommitdiff
path: root/opengl/tests/gl_basic/gl_basic.cpp
diff options
context:
space:
mode:
authorBrad Fitzpatrick <bradfitz@android.com>2010-09-03 12:49:44 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2010-09-03 12:49:44 -0700
commit79c2bf154226a2382fc693ae5bd8709dcd0a2312 (patch)
tree6ca016689d76855a34a6cd944e00a19b1cb92bcd /opengl/tests/gl_basic/gl_basic.cpp
parentd9d339aaa07907eea37757776f38846529b871cc (diff)
parent962f3a99d09dbddf7cc77933ac624a0f544fbe62 (diff)
am a2f2141c: Merge "More SharedPreferences commit() -> apply() changes." into gingerbread
Merge commit 'a2f2141c84923e34e003bec92b7435ea79b02ee8' into gingerbread-plus-aosp * commit 'a2f2141c84923e34e003bec92b7435ea79b02ee8': More SharedPreferences commit() -> apply() changes.
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions