am bdb78458: (-s ours) Import translations. DO NOT MERGE
authorGeoff Mendal <mendal@google.com>
Mon, 13 Jul 2015 15:11:27 +0000 (15:11 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Mon, 13 Jul 2015 15:11:27 +0000 (15:11 +0000)
commitb34b9a0c142b8cc909b4e86a50deae2f02cecb3f
treee54905f05ec423e62f7c0124c7d19cc84e47aaca
parentd473cf8f85f60d53b20270a263afe6b138671cb5
parentbdb784583441806542b90e8dfe454eb85d995037
am bdb78458: (-s ours) Import translations. DO NOT MERGE

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