am b34b9a0c: (-s ours) am bdb78458: (-s ours) Import translations. DO NOT MERGE
authorGeoff Mendal <mendal@google.com>
Mon, 13 Jul 2015 15:25:31 +0000 (15:25 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Mon, 13 Jul 2015 15:25:31 +0000 (15:25 +0000)
commitddf6e375aa5935d5fb4a5475fee0a3582abda9bc
tree9d80047397775b1a130a981647bd12ca4e6c8eb0
parent458def94bc8be8d672eb860023b96a4c2b541ad1
parentb34b9a0c142b8cc909b4e86a50deae2f02cecb3f
am b34b9a0c: (-s ours) am bdb78458: (-s ours) Import translations. DO NOT MERGE

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