tree 722afd5f3eb8e540f8beedffeb63eebb14be532f
parent e1077eefc3d76a376b4948fe50b3f293683f93f9
parent 2fd61cfbc12d9b20b9bde75dcb9381449b80d72e
author Geoff Mendal <mendal@google.com> 1417463995 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1417463995 +0000

am 2fd61cfb: (-s ours) am d48e7b85: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev

* commit '2fd61cfbc12d9b20b9bde75dcb9381449b80d72e':
  Import translations. DO NOT MERGE