tree f9d8fec56add46d7f76054383c9f50092e604835
parent c5613eeafab43b7203b8e81bc0d267fdafc98a3b
parent 945aace87fb83d0a3f44bd9369932b1796c8dcc7
author Eric Fischer <enf@google.com> 1321470060 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1321470060 -0800

am 945aace8: Merge "Import revised translations.  DO NOT MERGE" into ics-mr1

* commit '945aace87fb83d0a3f44bd9369932b1796c8dcc7':
  Import revised translations.  DO NOT MERGE