AI 144107: am: CL 144098 am: CL 144093 Fix NPE in ActivityUnitTestCase.
  Original author: brettchabot
  Merged from: //branches/cupcake/...
  Original author: android-build
  Merged from: //branches/donutburger/...

Automated import of CL 144107
1 file changed