am e5823b2c: am eb8fc4a0: (-s ours) Import translations for search engine setting.  DO NOT MERGE

Merge commit 'e5823b2c43f0910dcdea7163a28adf56c6928231' into gingerbread-plus-aosp

* commit 'e5823b2c43f0910dcdea7163a28adf56c6928231':
  Import translations for search engine setting.  DO NOT MERGE