tree e25dff5fd21097fa62b1a8a3e2525d349cc08d20
parent 8608b1636a6cb6f53429c0bcac5beda997c49b0a
parent 6e0d2c19b0538842044efca05b11fe2d7d7d7092
author Baligh Uddin <baligh@google.com> 1392410143 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1392410143 +0000

am 6e0d2c19: (-s ours) am 90ec376f: (-s ours) Import translations. DO NOT MERGE

* commit '6e0d2c19b0538842044efca05b11fe2d7d7d7092':
  Import translations. DO NOT MERGE