tree 0b69d8c76d559ccf7b6c3ae210b5fdadba4c9812
parent e714c4b9d9dcbd52901b0e64d0aaa37158efd189
parent c75dd6f6b12287d571b8a0facd8465fdcca40973
author Baligh Uddin <baligh@google.com> 1443538655 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1443538655 +0000

am c75dd6f6: (-s ours) am 70de475c: (-s ours) Import translations. DO NOT MERGE

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