tree c8c22b100ff97ee5406e23b498db15918c36a973
parent cc167f03c79b126057235644d016a60de6290fd8
parent 6006439c15528bd8f5a85b20f470037b48a76e59
author Baligh Uddin <baligh@google.com> 1404683834 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1404683834 +0000

am 6006439c: (-s ours) Import translations. DO NOT MERGE

* commit '6006439c15528bd8f5a85b20f470037b48a76e59':
  Import translations. DO NOT MERGE