am 813e1bfe: (-s ours) am 13ff526b: (-s ours) Import translations. DO NOT MERGE

automerge: eccc844  -s ours

* commit 'eccc8442bf41b6741ce80ca7ea8898a32252815f':
  Import translations. DO NOT MERGE
This commit is contained in:
Geoff Mendal 2014-11-03 23:54:36 +00:00 committed by android-build-merger
commit b8e32c967e

Diff Content Not Available