am 2f12b803: (-s ours) am eded9424: (-s ours) Import translations. DO NOT MERGE

* commit '2f12b803e913117edbed7a9409f04b1d00686eba':
  Import translations. DO NOT MERGE
This commit is contained in:
Geoff Mendal
2015-03-23 12:55:52 +00:00
committed by Android Git Automerger

Diff Content Not Available