am eb140c18: (-s ours) Import translations. DO NOT MERGE
authorBaligh Uddin <baligh@google.com>
Mon, 29 Sep 2014 20:47:02 +0000 (20:47 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Mon, 29 Sep 2014 20:47:02 +0000 (20:47 +0000)
commit890cfb8aa369ab5feb4f598d569a71e69ea28e50
treedc7a2015cc6946c61dc348ff1a2048ab26075b1e
parentf4b1e9c83db5c09c238c04000c34e0e397a74f18
parenteb140c18d92779ebfe909d3e331707697afb91f8
am eb140c18: (-s ours) Import translations. DO NOT MERGE

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