summaryrefslogtreecommitdiff
path: root/opengl/tests/gl_basic/gl_basic.cpp
diff options
context:
space:
mode:
authorJesse Wilson <jessewilson@google.com>2010-04-10 11:41:38 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2010-04-10 11:41:38 -0700
commit7e97d87b020d91c50fd3cd5c69f010f2c4cf5bce (patch)
tree3e5f86120f1ff365c1753580da989ae35d07c503 /opengl/tests/gl_basic/gl_basic.cpp
parentedc5c788bea6c2a4232d202d9d4db9116ae73c06 (diff)
parent533d3546217b86bd52c0869316e15b5b4bcb4d6b (diff)
am bc284a5f: Merge "Move the public method HttpDateTime.parse() into AndroidHttpClient." into froyo
Merge commit 'bc284a5f9f1e3f19ddd45cfb233f0d1775b612a7' into froyo-plus-aosp * commit 'bc284a5f9f1e3f19ddd45cfb233f0d1775b612a7': Move the public method HttpDateTime.parse() into AndroidHttpClient.
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions