summaryrefslogtreecommitdiff
path: root/opengl/tests/gl_basic/gl_basic.cpp
diff options
context:
space:
mode:
authorKenny Root <kroot@google.com>2010-09-15 07:08:15 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2010-09-15 07:08:15 -0700
commitbe42f39a046d6f7fac08ba3d737cd66caa112538 (patch)
tree1e7afed8ff0231c6b168062fa8f04396d6eb7f2f /opengl/tests/gl_basic/gl_basic.cpp
parent48d9424e8118a2362e2d5c29dae6e0b8708679ea (diff)
parent1bf8fd86c259f98acaf42ec532a13fe48c6c0cf3 (diff)
am 3ca26914: am 30434415: Merge "Dedupe timestamp in PackageSettings" into gingerbread
Merge commit '3ca2691446d333d52b1c0a39e6df74e03c2407cc' * commit '3ca2691446d333d52b1c0a39e6df74e03c2407cc': Dedupe timestamp in PackageSettings
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions