am d58e82b4: (-s ours) Import translations. DO NOT MERGE
authorGeoff Mendal <mendal@google.com>
Fri, 27 Feb 2015 16:39:54 +0000 (16:39 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Fri, 27 Feb 2015 16:39:54 +0000 (16:39 +0000)
commit2c63c367443383fffbefbaafcb91a0131275f437
treef0dc34a411a6160bdb2fc7c0c5abc98e88bc2e47
parentc8cb253d8d21936538a53f4e60577fe83bef08a2
parentd58e82b40b13269f20babd3120b5d4fcbd3c0d91
am d58e82b4: (-s ours) Import translations. DO NOT MERGE

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