AI 143712: am: CL 143685 am: CL 143547 Import revised translations.
  Original author: enf
  Merged from: //branches/cupcake/...
  Original author: android-build
  Merged from: //branches/donutburger/...

Automated import of CL 143712
3 files changed