tree 015fe1e4f29c33b68c93cb32029430c49b10e0e8
parent 1cffcc51feecf320995aa3289143f02e0d240c74
parent ddacd6acc2dea20dc83d502674bd07896b7bec92
author Baligh Uddin <baligh@google.com> 1413764698 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1413764698 +0000

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

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