tree d8d2a645079e7e380315ac3c207fbaa967c7340b
parent 7f72f47a7d814aade99badb62d69c86b4bd58fd2
parent 6b51959c3ea54812e6cb2d9d213a59da62a99309
author Baligh Uddin <baligh@google.com> 1386866892 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1386866892 +0000

am 6b51959c: (-s ours) am f0ab16cf: (-s ours) am b24fcaae: (-s ours) Import translations. DO NOT MERGE

* commit '6b51959c3ea54812e6cb2d9d213a59da62a99309':
  Import translations. DO NOT MERGE