tree b0384f8be62a2631ee25746e489c14b08d929246
parent 0e67685e53cbcf7682a0364cf34fd3ac0632596f
parent 68f0d47e8ee045dffb5f59c67cc77f38598472c5
author Eric Fischer <enf@google.com> 1321918296 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1321918296 -0800

am 68f0d47e: Merge "Import revised translations. DO NOT MERGE" into ics-mr1

* commit '68f0d47e8ee045dffb5f59c67cc77f38598472c5':
  Import revised translations. DO NOT MERGE