tree 10da860fcff71886af91d082e31f0e1917926848
parent 5dd8165f9b9b8cea8bb6fe1f6bfc34fdee65fef9
parent 0ef051bd3da6b7b6dffbbf6251e15cad2eaef574
author Baligh Uddin <baligh@google.com> 1414566472 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1414566472 +0000

am 0ef051bd: (-s ours) am a003c8ed: (-s ours) am 4487e0aa: (-s ours) am beb7bc60: (-s ours) Import translations. DO NOT MERGE

* commit '0ef051bd3da6b7b6dffbbf6251e15cad2eaef574':
  Import translations. DO NOT MERGE