tree 10602de228bd66670a2f52bcd90ee31090e06248
parent 0966d9f112891b026eaaa615af95c792f132908f
author Eric Fischer <> 1238715736 -0700
committer The Android Open Source Project <initial-contribution@android.com> 1238715736 -0700

AI 144336: am: CL 144335 Import US Spanish translations, and a few Japanese changes.
  Original author: enf
  Merged from: //branches/cupcake/...

Automated import of CL 144336