tree 3e7b9e07b88681d5a3d5bfd7af6c4d02eb783720
parent 7e82db90b75dea894a45961c801444a40c668f5b
parent 37f1a648f8c89b128cd9c277ea98a73118e5733b
author Geoff Mendal <mendal@google.com> 1432736218 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1432736218 +0000

am 37f1a648: (-s ours) am 4a11fe37: (-s ours) am 0d70f70a: (-s ours) Import translations. DO NOT MERGE

* commit '37f1a648f8c89b128cd9c277ea98a73118e5733b':
  Import translations. DO NOT MERGE