tree 16bae1714534229680e62853d70a282d203819ac
parent ca7d7e6b2afb2cec021078cca8672d1517697a62
parent 32771d6816b0bc5ef45ecc081eed654ecb96eecb
author Geoff Mendal <mendal@google.com> 1436978588 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1436978588 +0000

am 32771d68: (-s ours) am 751b01e3: (-s ours) Import translations. DO NOT MERGE

* commit '32771d6816b0bc5ef45ecc081eed654ecb96eecb':
  Import translations. DO NOT MERGE