am 5e116a6d: (-s ours) Import translations. DO NOT MERGE
authorGeoff Mendal <mendal@google.com>
Fri, 27 Feb 2015 16:34:35 +0000 (16:34 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Fri, 27 Feb 2015 16:34:35 +0000 (16:34 +0000)
commit82f69f42c87b6868fd5398e72f12685a84f66faf
tree29f499e21f6f3234751dc7d554cbbc83ff1e998c
parent590ccb96d0bd46014ce6767c5b0a8ef7109a8274
parent5e116a6d63b4f5060041adeeb1bdc2b0585266cd
am 5e116a6d: (-s ours) Import translations. DO NOT MERGE

* commit '5e116a6d63b4f5060041adeeb1bdc2b0585266cd':
  Import translations. DO NOT MERGE