tree 6d87006194f353e4365f9c0072e3a44a734d80e1
parent 34df5a5b36bc9848d5a098c889931879b9866cf4
parent 9a646bbbd0b51a63e424dfcea28df8ef3fea2b2c
author Baligh Uddin <baligh@google.com> 1392410223 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1392410223 +0000

am 9a646bbb: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-ub-now-kermit

* commit '9a646bbbd0b51a63e424dfcea28df8ef3fea2b2c':
  Import translations. DO NOT MERGE