tree c15030c04aaaa1f3504c98b2bb6d521a4e2166b6
parent 9a646bbbd0b51a63e424dfcea28df8ef3fea2b2c
parent 80a603f77d7df6d742131db7a848f06e0a762569
author Baligh Uddin <baligh@google.com> 1382023778 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1382023778 -0700

am 80a603f7: (-s ours) am b178a362: (-s ours) Import translations. DO NOT MERGE

* commit '80a603f77d7df6d742131db7a848f06e0a762569':
  Import translations. DO NOT MERGE