tree e25dff5fd21097fa62b1a8a3e2525d349cc08d20
parent 171ed627eab58b017bed79d267ad3def7ab90b7e
parent c1ed7f3b4b12c583e65e6cde607f7547ee6510f8
author Baligh Uddin <baligh@google.com> 1384189873 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1384189873 -0800

am c1ed7f3b: (-s ours) am 322554a0: (-s ours) Import translations. DO NOT MERGE

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