tree c3443b8704d4b2569b3844b4b79b0b71a4195e05
parent d108c3003b7e205ea24c1ddadd20c71bd222673c
author Scott Main <> 1240386910 -0700
committer The Android Open Source Project <initial-contribution@android.com> 1240386910 -0700

AI 147318: am: CL 147317 am: CL 147314 change carousel SDK to 1.5;
  revise Google IO info
  Original author: smain
  Merged from: //branches/cupcake/...
  Original author: android-build

Automated import of CL 147318