am 855f0d26: (-s ours) Import translations. DO NOT MERGE automerge: c7df50c -s ours

automerge: 967c000  -s ours

* commit '967c000603e40704008a094cce3f3348acab7cf8':
  Import translations. DO NOT MERGE
This commit is contained in:
Geoff Mendal
2014-10-27 21:36:10 +00:00
committed by android-build-merger

Diff Content Not Available