tree 767f2f1aac05f0d6dd805b7a865e3f5cec22404d
parent c7c856fb855cdf233077857b995594770515cf1b
parent 9c6895924053c0b732dcb2dd3ef7f419a4dab8c1
author Scott Main <smain@google.com> 1273676161 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1273676161 -0700

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