tree f4e83fdef0edf47fa2e6691b2825fa6002edaa58
parent 84af1965c074a3101682f6543eb7eaad046c6bce
parent 5d9dacc682b6cade694d0fc29c6951ede173c727
author Eric Fischer <enf@google.com> 1260496654 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1260496654 -0800

am 5d9dacc6: (-s ours) am 41ed4478: am 6799f0f9: (-s ours) Import revised translations.  DO NOT MERGE

Merge commit '5d9dacc682b6cade694d0fc29c6951ede173c727'

* commit '5d9dacc682b6cade694d0fc29c6951ede173c727':
  Import revised translations.  DO NOT MERGE