am 2a9fef1a: (-s ours) Import translations. DO NOT MERGE automerge: 40e66bc -s ours

* commit '2a9fef1ae71c2580741a8ac960a385e915622c17':
  Import translations. DO NOT MERGE
This commit is contained in:
Geoff Mendal
2015-02-04 18:58:05 +00:00
committed by Android Git Automerger

Diff Content Not Available