am bc0f8d36: (-s ours) am 5fc2b7c0: (-s ours) Import translations. DO NOT MERGE

* commit 'bc0f8d3645329287c8965168672def96c6c8212f':
  Import translations. DO NOT MERGE
tree: aa0afeabac57c1f6cb9287378d438f796de29c8b
  1. Android.mk
  2. chromium/