tree 4e06619ef6e9bfd887d4b77bad1fd59fc87319f3
parent 43cb96a2911870b9ee829c6bdcffa26065bc53e6
parent 916a53dd99aeef87ec98450fcc4960141183ebe9
author Baligh Uddin <baligh@google.com> 1413748647 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1413748647 +0000

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

* commit '916a53dd99aeef87ec98450fcc4960141183ebe9':
  Import translations. DO NOT MERGE