summaryrefslogtreecommitdiff
path: root/opengl/tests/gl_basic/gl_basic.cpp
diff options
context:
space:
mode:
authorDirk Dougherty <ddougherty@google.com>2010-05-26 18:33:05 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2010-05-26 18:33:05 -0700
commitf69fd4dd481c10749a8651ab6c9cfda1dea68297 (patch)
treeb5d35857366a586ad80448b7f4f5121a661f7f4a /opengl/tests/gl_basic/gl_basic.cpp
parent81800015afe3ee397bc6b07e37fd6dc57e3a3b9b (diff)
parent4273ce19bf898ee41f2342209af6fe8ef4fb128e (diff)
am 4273ce19: Merge "Doc change: Suggest min keysize of 2048 for keys." into froyo
Merge commit '4273ce19bf898ee41f2342209af6fe8ef4fb128e' into froyo-plus-aosp * commit '4273ce19bf898ee41f2342209af6fe8ef4fb128e': Doc change: Suggest min keysize of 2048 for keys.
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions