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

am 1c7ebf8f: (-s ours) am 69d9e470: (-s ours) Import revised translations.  DO NOT MERGE

* commit '1c7ebf8f9cfa08d5f6fd1a10cf65ffffc0af6a47':
  Import revised translations.  DO NOT MERGE