OSDN Git Service

am eb8fc4a0: (-s ours) Import translations for search engine setting. DO NOT MERGE
authorEric Fischer <enf@google.com>
Tue, 21 Sep 2010 19:54:17 +0000 (12:54 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Tue, 21 Sep 2010 19:54:17 +0000 (12:54 -0700)
Merge commit 'eb8fc4a0afa7d7bee3a03d63f62ab24c0a75b99f' into gingerbread

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


Trivial merge