am 1312b216: (-s ours) Merge "Revert "Import translations. DO NOT MERGE""

* commit '1312b216a8b0fd882b380f1caf6e0f2ed38ef7a8':
  Revert "Import translations. DO NOT MERGE"
main
Geoff Mendal 2015-03-02 15:36:39 +00:00 committed by Android Git Automerger
commit 20abab6a24

Diff Content Not Available