tree 91d1835a08f9b18d02a46c122c5b213a39338645
parent caf74ca74e42f9dafa621eae6e4a59f7d7a1c9c5
parent 012be0da902c686b1a7baf1ca85b42292cd9d530
author Baligh Uddin <baligh@google.com> 1443538207 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1443538207 +0000

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

* commit '012be0da902c686b1a7baf1ca85b42292cd9d530':
  Import translations. DO NOT MERGE