tree 383bfb90e1940881c4f125f4b595ef1d2ad44e5a
parent 9c1c0f98aa1ccd74dfba56ac3b4164ba88a00e43
parent 50391c0e2bfd746cff84d23a430d213c8ead92f3
author Baligh Uddin <baligh@google.com> 1408286437 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1408286437 +0000

am 50391c0e: (-s ours) am 3da05cbf: (-s ours) am 0c7b1b05: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev

* commit '50391c0e2bfd746cff84d23a430d213c8ead92f3':
  Import translations. DO NOT MERGE