summaryrefslogtreecommitdiff
path: root/opengl/tests/gl_basic/gl_basic.cpp
diff options
context:
space:
mode:
authorJesse Wilson <jessewilson@google.com>2010-04-10 11:47:45 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2010-04-10 11:47:45 -0700
commit5dda520f80fd9ad042724f1c692c938b49964375 (patch)
treec4333b1d19b4dea3beb4fd5c98a3afcd88572544 /opengl/tests/gl_basic/gl_basic.cpp
parent747a91a3685e4dcc9cbc42c4069b0cda313ceff0 (diff)
parent7e97d87b020d91c50fd3cd5c69f010f2c4cf5bce (diff)
am f9e90378: am bc284a5f: Merge "Move the public method HttpDateTime.parse() into AndroidHttpClient." into froyo
Merge commit 'f9e90378d50210298d1cec2b913653597cd62be4' into kraken * commit 'f9e90378d50210298d1cec2b913653597cd62be4': 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