tree 7f7537a8a14b7e5a6bb6f910234d2dd5e6e0a8c1
parent 7d9381ace1b230b57191bebed47df9da94563cfc
parent 86ab81d5e9ee76c1e59f197dd1372f455c018beb
author Geoff Mendal <mendal@google.com> 1438126445 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1438126445 +0000

am 86ab81d5: (-s ours) am a629d7d2: (-s ours) am 9fd976e4: (-s ours) Import translations. DO NOT MERGE

* commit '86ab81d5e9ee76c1e59f197dd1372f455c018beb':
  Import translations. DO NOT MERGE