tree 87f388a442a7f477d7d79a59390decfaaa38a0bd
parent 655e0390483410cf3068ca2aad4c9bdb3a04cdcc
parent b8d55913c9108ecbafde65bbc730d50b867d81d9
author Baligh Uddin <baligh@google.com> 1412095120 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1412095120 +0000

am b8d55913: (-s ours) am 3a9c1a0f: (-s ours) Import translations. DO NOT MERGE

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