am eb140c18: (-s ours) Import translations. DO NOT MERGE
authorBaligh Uddin <baligh@google.com>
Mon, 29 Sep 2014 20:45:25 +0000 (20:45 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Mon, 29 Sep 2014 20:45:25 +0000 (20:45 +0000)
commitb4f1c7f17429dec5683447f8bf9674da6feb70d0
tree8b8c7dc1e76c54af9ad78e93ba873068df73ec2b
parentf89882e431314ac3fa3b1f786c8c394631faec25
parenteb140c18d92779ebfe909d3e331707697afb91f8
am eb140c18: (-s ours) Import translations. DO NOT MERGE

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