summaryrefslogtreecommitdiff
path: root/opengl/tests/gl_basic/gl_basic.cpp
diff options
context:
space:
mode:
authorBrad Fitzpatrick <bradfitz@android.com>2010-09-03 13:27:51 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2010-09-03 13:27:51 -0700
commit68fd04dba4d108cb51235f20184e22e13126bc87 (patch)
tree365957e2f10f97798d21ec768eca47c686f90315 /opengl/tests/gl_basic/gl_basic.cpp
parente93f2c36bd775e2bec4434269067577fbc135331 (diff)
parent79c2bf154226a2382fc693ae5bd8709dcd0a2312 (diff)
am 9eb32c96: am a2f2141c: Merge "More SharedPreferences commit() -> apply() changes." into gingerbread
Merge commit '9eb32c96c872512c8aedc8627a4b96e9ea2a1a28' * commit '9eb32c96c872512c8aedc8627a4b96e9ea2a1a28': More SharedPreferences commit() -> apply() changes.
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions