summaryrefslogtreecommitdiff
path: root/opengl/java/android
diff options
context:
space:
mode:
authorScott Main <smain@google.com>2010-05-12 07:56:01 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2010-05-12 07:56:01 -0700
commit5cb0d5015a145734e4bf50f45c8e6d7711c914dc (patch)
tree767f2f1aac05f0d6dd805b7a865e3f5cec22404d /opengl/java/android
parentc7c856fb855cdf233077857b995594770515cf1b (diff)
parent9c6895924053c0b732dcb2dd3ef7f419a4dab8c1 (diff)
am 9c689592: am c80b95a8: Merge "docs: announce froyo and update IO message" into froyo
Merge commit '9c6895924053c0b732dcb2dd3ef7f419a4dab8c1' into kraken * commit '9c6895924053c0b732dcb2dd3ef7f419a4dab8c1': docs: announce froyo and update IO message
Diffstat (limited to 'opengl/java/android')
0 files changed, 0 insertions, 0 deletions