tree c8d9bc0456ab9f268ad7f1f69f55af28689f81e9
parent 20bc2fef754d5a90ea72b351001f80b328f271d6
author Baligh Uddin <baligh@google.com> 1379219512 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1379219512 -0700

am 432e542f: (-s ours) Import translations. DO NOT MERGE

* commit '432e542fc574cc5ff42cd964bc645789b13786f6':
  Import translations. DO NOT MERGE