tree c2854f9c72d274b559da4fa7dc09d7d534b3c17b
parent 211ddc7f4d2f4d0df6fa295fe8b82018e7860d5f
parent 43f14897cf4577ee319d4a53c0410fe2755735f4
author Baligh Uddin <baligh@google.com> 1414775674 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1414775674 +0000

am 43f14897: (-s ours) Import translations. DO NOT MERGE

* commit '43f14897cf4577ee319d4a53c0410fe2755735f4':
  Import translations. DO NOT MERGE