am c7f102af: (-s ours) am f4b1e9c8: (-s ours) am 09128d0a: (-s ours) Import translati...
authorBaligh Uddin <baligh@google.com>
Tue, 16 Sep 2014 17:17:25 +0000 (17:17 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Tue, 16 Sep 2014 17:17:25 +0000 (17:17 +0000)
commit870ab30a0546f37791f0ac0299074406c387b890
treedc7a2015cc6946c61dc348ff1a2048ab26075b1e
parent45cba96a4496ed0551c74dc2c738d3cf1b8ae0f7
parentc7f102af0b5025fc5ce0ba6690bfaafc49a44d42
am c7f102af: (-s ours) am f4b1e9c8: (-s ours) am 09128d0a: (-s ours) Import translations. DO NOT MERGE

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