summaryrefslogtreecommitdiff
path: root/opengl/tests/gl_basic/gl_basic.cpp
diff options
context:
space:
mode:
authorErik <roboerik@android.com>2010-09-14 12:25:31 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2010-09-14 12:25:31 -0700
commitb51030fbf0f903e1912b4fdbe74ca6cf2b9f3a9c (patch)
tree1664382aa17eb82db6f397d535fff7bd57ac2055 /opengl/tests/gl_basic/gl_basic.cpp
parent991abcb98a8014f780ef066648f15101782d7cdd (diff)
parent336da25dda238dda2f2021cc9f3f848d6214dcc8 (diff)
am b92788aa: Merge "Adds time zone functionality into fw as a hidden api" into gingerbread
Merge commit 'b92788aa040d0971b4e54589aef7675f34d96e5d' into gingerbread-plus-aosp * commit 'b92788aa040d0971b4e54589aef7675f34d96e5d': Adds time zone functionality into fw as a hidden api
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions