tree d8efa2b1899ffe73c6b681057dbf616a14c9d823
parent fd990534c42ea0be37f81df16e48d278a7c4d6e7
author Eric Fischer <> 1238740277 -0700
committer The Android Open Source Project <initial-contribution@android.com> 1238740277 -0700

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

Automated import of CL 144411