tree a6399518fec1a47334d511cd66543d53f69e736a
parent 24727f19f0c01b6b3106fc0383d262a72f4487df
parent 196bc63b92bec578e351445348fcb66071673b8a
author Eric Fischer <enf@google.com> 1285015579 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1285015579 -0700

am 196bc63b: (-s ours) Use translation from donut for "Set search engine."  DO NOT MERGE

Merge commit '196bc63b92bec578e351445348fcb66071673b8a' into gingerbread

* commit '196bc63b92bec578e351445348fcb66071673b8a':
  Use translation from donut for "Set search engine."  DO NOT MERGE