summaryrefslogtreecommitdiff
path: root/opengl/tests/gl_basic/gl_basic.cpp
diff options
context:
space:
mode:
authorAndreas Huber <andih@google.com>2010-10-04 11:51:55 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2010-10-04 11:51:55 -0700
commitaefad3079ee8efd742fbcaae234c33ef512adfe9 (patch)
treec7f57a471ef7a293ba101955c412b9d2376d3908 /opengl/tests/gl_basic/gl_basic.cpp
parent8ee567423c7c713893c558e787ebf08edcc20235 (diff)
parent2f110ae1ae0be55e2fbf31b9a83968f94b3eebba (diff)
am dfd03fe9: am aa1a694d: Merge "Make sure to finish the preparation phase even EOS occurs before we consider the cache to be completely filled up." into gingerbread
Merge commit 'dfd03fe99336792b6dae6c4c9fd5f5ba157e054c' * commit 'dfd03fe99336792b6dae6c4c9fd5f5ba157e054c': Make sure to finish the preparation phase even EOS occurs before we consider the cache to be completely filled up.
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions