tree 87f388a442a7f477d7d79a59390decfaaa38a0bd
parent 7b08f96e4d8fdd4f48c77b024ee23c66b72b1019
parent ba335c5bef552002e502b76aa311e5a06b5940d3
author Baligh Uddin <baligh@google.com> 1413816189 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1413816189 +0000

am ba335c5b: (-s ours) am 3689cdd7: (-s ours) Import translations. DO NOT MERGE

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