tree c2668ed3eb9faf84fabe69b3c7d19bdd320bf9cd
parent 10f8950a25fa4116759e52e454a7341822c19949
parent 56f01033c262d78a6ef6b058858e4f76bb5993ef
author Geoff Mendal <mendal@google.com> 1439041799 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1439041799 +0000

am 56f01033: (-s ours) am 40d4dd84: (-s ours) am 82640f6f: (-s ours) Import translations. DO NOT MERGE

* commit '56f01033c262d78a6ef6b058858e4f76bb5993ef':
  Import translations. DO NOT MERGE