AI 144826: am: CL 144821 am: CL 144818 Bringing archive down to zero broken tests.
  Original author: jorgp
  Merged from: //branches/cupcake/...
  Original author: android-build

Automated import of CL 144826
1 file changed