tree f3669902fff1da70f637ad994a8b6bbaa3ba45c2
parent 3dab765afe890c41c3a8764298abf8bdc11309b4
parent 9a7f03dc2b45a65e6dde64c91b8fb5cc7950b90f
author Baligh Uddin <baligh@google.com> 1410519016 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1410519016 +0000

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

* commit '446a287d00196e234deb7b810477cec6f735d6fe':
  Import translations. DO NOT MERGE