tree 802a8ba269eac375be8189d7a8c72c40d2e697b6
parent 1c7ebf8f9cfa08d5f6fd1a10cf65ffffc0af6a47
parent 9a67efa1e56e80d57b3f9df484bce09f4304c62b
author Eric Fischer <enf@google.com> 1319238144 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1319238144 -0700

am 9a67efa1: (-s ours) Import revised translations.  DO NOT MERGE

* commit '9a67efa1e56e80d57b3f9df484bce09f4304c62b':
  Import revised translations.  DO NOT MERGE