tree a1fea658839598021eed89bce5fb0ed3b0a36078
parent 2c0b9cf758bb4918d36806b19450c1dc031a4816
parent ceb997bae0a93e7844276f2c8566951a8c7b1105
author Baligh Uddin <baligh@google.com> 1402144433 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1402144433 +0000

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

* commit '7c12fff112cf0bd09022bf2e87f721fc4c8526f3':
  Import translations. DO NOT MERGE