tree 19ab3fba69bd9bfeb70b2823e48cbd9e2a132068
parent 6759221873c9aaadbc77c56bb5fbf7914a312cb6
parent cd406480fa569ced379232d85efc4742c1bcc8c0
author Dirk Dougherty <ddougherty@google.com> 1273687810 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1273687810 -0700

am 68b37d14: am a04202b3: Merge "Doc change: remove Google I/O 09 from carousel." into froyo

Merge commit '68b37d14708414d3cee418024c178f0a3c7d8b5b' into kraken

* commit '68b37d14708414d3cee418024c178f0a3c7d8b5b':
  Doc change: remove Google I/O 09 from carousel.