am 5daa6dd1: (-s ours) Import translations. DO NOT MERGE
authorGeoff Mendal <mendal@google.com>
Wed, 15 Oct 2014 22:02:29 +0000 (22:02 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 15 Oct 2014 22:02:29 +0000 (22:02 +0000)
commit683fa2a1849d24686fd71530247c6046b7f4e3ec
treef5537d20fa3c831588bfb1a2621a92f4a47c6b5c
parentebd05f0e5afb6766050d2d85df1aaa3b37a554eb
parent5daa6dd11cfe3bc7b814dd994b1fdc7ad878de9f
am 5daa6dd1: (-s ours) Import translations. DO NOT MERGE

* commit '5daa6dd11cfe3bc7b814dd994b1fdc7ad878de9f':
  Import translations. DO NOT MERGE