tree 16b4282815477f58fbbe5e0190dc9f61b11298e4
parent 77a7308dd1c8335cf3c5ffce0b2cd6a74ca1e46e
parent 3b419c0f5c870960b11c9fde81e9eb8ea8976aad
author Geoff Mendal <mendal@google.com> 1426693776 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1426693776 +0000

am 3b419c0f: (-s ours) am c0ca0de7: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-modular-dev

* commit '3b419c0f5c870960b11c9fde81e9eb8ea8976aad':
  Import translations. DO NOT MERGE