tree 09de8a788aa2aacc32edb5010d772eadb00f3646
parent ba0c54f61068c42336fa0aa55a8f5a60673b525a
parent ddacd6acc2dea20dc83d502674bd07896b7bec92
author Baligh Uddin <baligh@google.com> 1413764521 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1413764521 +0000

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

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