AI 143350: am: CL 143199 am: CL 142978 ADT #1738393: fix typo in launch controller.
  Also fixed some javadoc warnings.
  Original author: raphael
  Merged from: //branches/cupcake/...
  Original author: android-build
  Merged from: //branches/donutburger/...

Automated import of CL 143350
3 files changed