am c7c23071: (-s ours) Import translations. DO NOT MERGE
authorGeoff Mendal <mendal@google.com>
Fri, 13 Feb 2015 01:14:48 +0000 (01:14 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Fri, 13 Feb 2015 01:14:48 +0000 (01:14 +0000)
commit590ccb96d0bd46014ce6767c5b0a8ef7109a8274
tree29f499e21f6f3234751dc7d554cbbc83ff1e998c
parent5d53e8dfdc77be8bd5665a7eec053a0dcdf0b7c8
parentc7c23071be84c8df58cc59a9597ae84af5cac026
am c7c23071: (-s ours) Import translations. DO NOT MERGE

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