tree 92d7e05141833f6971e337afd9ebee657f51377b
parent f48da3892c629c746150d835902683e1be54ef4e
parent d876e29eadbee94fe9933b961e6363ac6e337d90
author Baligh Uddin <baligh@google.com> 1411063451 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1411063451 +0000

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

* commit 'd876e29eadbee94fe9933b961e6363ac6e337d90':
  Import translations. DO NOT MERGE