am 09128d0a: (-s ours) Import translations. DO NOT MERGE
authorBaligh Uddin <baligh@google.com>
Tue, 16 Sep 2014 15:40:20 +0000 (15:40 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Tue, 16 Sep 2014 15:40:20 +0000 (15:40 +0000)
commitf4b1e9c83db5c09c238c04000c34e0e397a74f18
treedc7a2015cc6946c61dc348ff1a2048ab26075b1e
parent45cba96a4496ed0551c74dc2c738d3cf1b8ae0f7
parent09128d0adc82fc4a5ffd6fdab18e0c5b69a78cbb
am 09128d0a: (-s ours) Import translations. DO NOT MERGE

* commit '09128d0adc82fc4a5ffd6fdab18e0c5b69a78cbb':
  Import translations. DO NOT MERGE