tree 6ef2a22eba4b1088e6a2c53dedfd488c25fd3185
parent 6e496ea35f3c7ca26167cd16f0f4071c13450f06
parent 2a950150aa11101f417fe2c41bafcceb42675691
author Baligh Uddin <baligh@google.com> 1379219633 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1379219633 -0700

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

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