tree c2668ed3eb9faf84fabe69b3c7d19bdd320bf9cd
parent ef184932f32de08a6ba99ce5de3930f2a746eb95
parent 40d4dd8409f6fcb88dcb19d30eca9e107f147df5
author Geoff Mendal <mendal@google.com> 1439041419 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1439041419 +0000

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

* commit '40d4dd8409f6fcb88dcb19d30eca9e107f147df5':
  Import translations. DO NOT MERGE