tree 613c9167bbf6151d0ad33f7b81c9d628fd3d4cec
parent b680eed100cbcbc4270d0fa15daa94fd74baf1a9
parent 5179b9a3f9b4daec5ed66594b0ef75cf93d0f1d3
author Baligh Uddin <baligh@google.com> 1404670555 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1404670555 +0000

am 5179b9a3: (-s ours) Import translations. DO NOT MERGE

* commit '5179b9a3f9b4daec5ed66594b0ef75cf93d0f1d3':
  Import translations. DO NOT MERGE