tree facc970b94be8412c304782e6012d36ed4b588f6
parent c68449cd3f3905c11602a4eee0d5beb6369d656d
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