AI 146537: am: CL 146133 am: CL 146132 Fixes from the review of 'Bringing XML down to one broken test.'
  Original author: ursg
  Merged from: //branches/cupcake/...
  Original author: android-build

Automated import of CL 146537
2 files changed