tree 967f2714b7c695a2c8690d8099672ae2c639bbb8
parent f17ec6f0d37ad28efd37c42ffdbcd71c135c547d
parent 470af74d47cebed221e11e0e066a8340c31b6300
author Baligh Uddin <baligh@google.com> 1400025269 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1400025269 +0000

am 470af74d: (-s ours) am 6979f4ca: (-s ours) Merge "Import translations. DO NOT MERGE"

* commit '470af74d47cebed221e11e0e066a8340c31b6300':