am 5431d1e9: (-s ours) am 2bb00d52: (-s ours) Import translations. DO NOT MERGE

automerge: da409fe  -s ours

* commit 'da409fea8230c49666ed634aeb7db629fb9425f3':
  Import translations. DO NOT MERGE
This commit is contained in:
Geoff Mendal
2014-12-10 19:25:10 +00:00
committed by android-build-merger

Diff Content Not Available