tree eb8c2679596612dd8171ec27d01a206048459f44
parent 9815e5ad92e47a2a23904ece53d5f6b10b82227e
parent 20dd965559e535271866dde7a682733bde7749b9
author Geoff Mendal <mendal@google.com> 1417030958 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1417030958 +0000

am 20dd9655: (-s ours) am 9641feee: (-s ours) am 38499cf8: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev

* commit '20dd965559e535271866dde7a682733bde7749b9':
  Import translations. DO NOT MERGE