am 234114ea: (-s ours) Import translations. DO NOT MERGE
authorGeoff Mendal <mendal@google.com>
Thu, 12 Feb 2015 20:13:52 +0000 (20:13 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 12 Feb 2015 20:13:52 +0000 (20:13 +0000)
commitc8cb253d8d21936538a53f4e60577fe83bef08a2
treef0dc34a411a6160bdb2fc7c0c5abc98e88bc2e47
parentcc422271fb5b643ea3801584315c20e5ddf666b2
parent234114eaed644dc7c384ca0ae91eada0de09aaad
am 234114ea: (-s ours) Import translations. DO NOT MERGE

* commit '234114eaed644dc7c384ca0ae91eada0de09aaad':
  Import translations. DO NOT MERGE