tree 15ab86dcd8f11585a7c122c4c13d969b80dc6a4c
parent afbc5fad91a5da627b908526b9604833d8d37bcb
parent 68b37d14708414d3cee418024c178f0a3c7d8b5b
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.