tree a5e4ae81facf4bb1fafd29e1486c2295c66f5a0f
parent aaccf5827269c71da9338516dcff4bf59f9336a2
parent bb46697b7d82b7e8c7ab4c471aaf4ca3a0a22a78
author Eric Fischer <enf@google.com> 1303121892 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1303121892 -0700

am bb46697b: am e7d4f0f9: am 41f61f09: (-s ours) Import revised translations.  DO NOT MERGE

* commit 'bb46697b7d82b7e8c7ab4c471aaf4ca3a0a22a78':
  Import revised translations.  DO NOT MERGE