tree 4ce3215693926ab94279f50f6c8520e4f05ca1fd
parent c9e9eca8271d1b721e3ec8ebaeaf846df491ad64
parent 2f0660b447f6dc4d0048450f5198c2345422e46b
author Baligh Uddin <baligh@google.com> 1442631866 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1442631866 +0000

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

* commit '2f0660b447f6dc4d0048450f5198c2345422e46b':
  Import translations. DO NOT MERGE