tree 2b7e8f5017f2f8ff4e36da6de5bb8b818fa1a16c
parent 57011a4c148bce346a68e7af33de701ac752ee74
parent 8ce06c0544ba4626a0f5ed9eef939634d421736f
author Baligh Uddin <baligh@google.com> 1415376200 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1415376200 +0000

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

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