tree d773639dfaaf0127283b4494f54a74d44a1e324a
parent da6e2ddb5bb9de84d004c726369f767c962adc18
parent 729ad90fb6c1b5c7c6e79507beb00934fbdd44ea
author Geoff Mendal <mendal@google.com> 1424992490 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1424992490 +0000

am 729ad90f: (-s ours) Import translations. DO NOT MERGE

* commit '729ad90fb6c1b5c7c6e79507beb00934fbdd44ea':
  Import translations. DO NOT MERGE