tree 37e0fc1e80f6d47557fd4c984c9a0c1a0c99e001
parent c875ad14ddc09d0d3a3bde58f71845123110f9f2
parent b719afc18db99fc71468607d73031432117d6540
author Geoff Mendal <mendal@google.com> 1438197837 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1438197837 +0000

am b719afc1: (-s ours) am a88be530: (-s ours) am de399af7: (-s ours) am 3986360a: (-s ours) Import translations. DO NOT MERGE

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