AI 144831: am: CL 144827 am: CL 144822 Bringing XML down to one broken test.
  Original author: jorgp
  Merged from: //branches/cupcake/...
  Original author: android-build

Automated import of CL 144831
2 files changed