tree 3eb3f927cd293cb702e9c1d99c28fbaf2b70ebc3
parent 7519eeab2304b299cabfbe8f34f1624814d4f22a
parent 00762492824dddf11d82934d4da24cf936a44bc4
author Baligh Uddin <baligh@google.com> 1398805820 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1398805820 +0000

am 3c1cce70: (-s ours) Import translations. DO NOT MERGE

* commit '3c1cce7013ea74dbd324da78da7db7fe7d445009':
  Import translations. DO NOT MERGE