tree 722afd5f3eb8e540f8beedffeb63eebb14be532f
parent d48e7b859cb39f12b9f8ab4c7c7eccd3e6581049
parent 5bba5aea8eef1567697e7d90ceb53f2366a2cecf
author Geoff Mendal <mendal@google.com> 1417453882 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1417453882 +0000

am 5bba5aea: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev

* commit '5bba5aea8eef1567697e7d90ceb53f2366a2cecf':
  Import translations. DO NOT MERGE