summaryrefslogtreecommitdiff
path: root/opengl/tests/gl_basic/gl_basic.cpp
diff options
context:
space:
mode:
authorBrad Fitzpatrick <bradfitz@android.com>2010-10-11 13:03:15 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2010-10-11 13:03:15 -0700
commitf115ddb3ec31ad0ff9c8799d831e58bc06fca0f7 (patch)
treed0f9cd06c9da12a52a9e6f2311a9b4eaa9e5c497 /opengl/tests/gl_basic/gl_basic.cpp
parent8d5ed611214d500f2761b45ce6477b158f0d0aba (diff)
parentaefa57869c0887ba3f796c6b553008b5b741a3ed (diff)
am ce2f1909: Merge "On boot, advance time to at least 1970." into gingerbread
Merge commit 'ce2f1909c74a1b90995f06a865d21260b062300b' into gingerbread-plus-aosp * commit 'ce2f1909c74a1b90995f06a865d21260b062300b': On boot, advance time to at least 1970.
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions