tree d77a2938ae2aaea6a2310413fde6104117191e3c
parent bfe79f82e3f9a12760f68c1a306362ddd223623f
parent a43677145544d5908e393b959e02f4d4ea070b44
author Baligh Uddin <baligh@google.com> 1414775758 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1414775758 +0000

am a4367714: (-s ours) am 8127df96: (-s ours) Import translations. DO NOT MERGE

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