tree 8656a516d8371840bb84463f553b2cf679529f38
parent 8bd03630bf7de19e866fa59124af2f4f069334b6
parent e04a4b509b7b057e6ad012562c3970648eb971c3
author Geoff Mendal <mendal@google.com> 1437709250 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1437709250 +0000

am e04a4b50: (-s ours) am b7d77afc: (-s ours) am a8f551b5: (-s ours) Import translations. DO NOT MERGE

* commit 'e04a4b509b7b057e6ad012562c3970648eb971c3':
  Import translations. DO NOT MERGE