tree 418e51053c916dfa0d82ecea5307dd4d4f15ab9e
parent 270f7d17aae1ca2211f185e80b4cf89f7268691e
parent c74ec672de7067f41eb1a1388b67098b4bf9dab9
author Baligh Uddin <baligh@google.com> 1381033432 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1381033432 -0700

am c74ec672: (-s ours) am 13ec7b20: (-s ours) Import translations. DO NOT MERGE

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