tree 3e2e58786bf1e70a3889fde2adcb79c494b0080d
parent 9d661beb7a7228e8fab6aa0c2e34a74b18214725
parent 38db5220aef61cade53870efc5533e1c40bef01a
author Geoff Mendal <mendal@google.com> 1439042173 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1439042173 +0000

am 38db5220: (-s ours) am 56f01033: (-s ours) am 40d4dd84: (-s ours) am 82640f6f: (-s ours) Import translations. DO NOT MERGE

* commit '38db5220aef61cade53870efc5533e1c40bef01a':
  Import translations. DO NOT MERGE