am 82f69f42: (-s ours) am 5e116a6d: (-s ours) Import translations. DO NOT MERGE
authorGeoff Mendal <mendal@google.com>
Fri, 27 Feb 2015 16:46:58 +0000 (16:46 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Fri, 27 Feb 2015 16:46:58 +0000 (16:46 +0000)
commit10bcb76c8ba8e95f9ba0c77992afaededd8746a3
tree2ac70b2b885c3d6e9be36e41cbe46caf712cad79
parentb37d1af8c3a1d57540180a1d25b20c004dcc1a01
parent82f69f42c87b6868fd5398e72f12685a84f66faf
am 82f69f42: (-s ours) am 5e116a6d: (-s ours) Import translations. DO NOT MERGE

* commit '82f69f42c87b6868fd5398e72f12685a84f66faf':
  Import translations. DO NOT MERGE