tree 6506ca86faa04cbd997e679ec0d878d6e35543f2
parent e0bcc8142a7260a955e4186a9fc3cbe12d238c39
parent ff9d22d62717c615ae6af0c52a31f79460084286
author Baligh Uddin <baligh@google.com> 1368204548 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1368204548 -0700

am ff9d22d6: (-s ours) am b3f4b48e: (-s ours) Import translations. DO NOT MERGE

* commit 'ff9d22d62717c615ae6af0c52a31f79460084286':
  Import translations. DO NOT MERGE