tree 8656a516d8371840bb84463f553b2cf679529f38
parent 1773edbb534e4849eafd76b5c5e97b889a5f5130
parent 9f162c074a661ed0b127f7802570d9bb72d15c2c
author Geoff Mendal <mendal@google.com> 1437710921 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1437710921 +0000

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

* commit '9f162c074a661ed0b127f7802570d9bb72d15c2c':
  Import translations. DO NOT MERGE