am f4b1e9c8: (-s ours) am 09128d0a: (-s ours) Import translations. DO NOT MERGE
authorBaligh Uddin <baligh@google.com>
Tue, 16 Sep 2014 16:50:55 +0000 (16:50 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Tue, 16 Sep 2014 16:50:55 +0000 (16:50 +0000)
commitc7f102af0b5025fc5ce0ba6690bfaafc49a44d42
treedc7a2015cc6946c61dc348ff1a2048ab26075b1e
parent45cba96a4496ed0551c74dc2c738d3cf1b8ae0f7
parentf4b1e9c83db5c09c238c04000c34e0e397a74f18
am f4b1e9c8: (-s ours) am 09128d0a: (-s ours) Import translations. DO NOT MERGE

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