am 393c1360: (-s ours) Import translations. DO NOT MERGE

automerge: 8a463d5  -s ours

* commit '8a463d55b81008ddc8fb1c3fd0c83ad5678f6c51':
  Import translations. DO NOT MERGE
This commit is contained in:
Geoff Mendal 2014-11-03 23:10:03 +00:00 committed by android-build-merger
commit 8e5ccfb48d

Diff Content Not Available