tree dbfed7b09255a7b58b016e45b560e75eef9aa065
parent db269a0baf81e3a13aed5db006ccf3346b039fe3
parent 3fc11847df3df8f8660ad736bbabb233995bb368
author Eric Fischer <enf@google.com> 1296319438 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1296319438 -0800

am 3fc11847: (-s ours) am 9a0b673c: Import revised translations.  DO NOT MERGE

* commit '3fc11847df3df8f8660ad736bbabb233995bb368':
  Import revised translations.  DO NOT MERGE