am 26a3e949: (-s ours) Import translations. DO NOT MERGE

automerge: 808ac6c  -s ours

* commit '808ac6cd14ee4061adc49d78f218a0f4142c153d':
  Import translations. DO NOT MERGE
This commit is contained in:
Geoff Mendal
2015-01-26 15:20:04 +00:00
committed by android-build-merger

Diff Content Not Available