tree c15030c04aaaa1f3504c98b2bb6d521a4e2166b6
parent 3aadac7fba87fd2c665d16fcc20dd535f1c1dcaf
parent b178a36244e4498b482978e1b49cf1a54467f55d
author Baligh Uddin <baligh@google.com> 1382023563 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1382023563 -0700

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

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