tree cba62d0d64153aa2169651696bc238591341d679
parent f5697c5904c3765e362fad47bf200103cf9d0e4c
parent 8cd3b4b3e75f3dfadec98e0099aa2c9d74509360
author Baligh Uddin <baligh@google.com> 1414085124 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1414085124 +0000

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

* commit '8cd3b4b3e75f3dfadec98e0099aa2c9d74509360':
  Import translations. DO NOT MERGE