Merge change 7054 into donut

* changes:
  Change the GoogleSearch strings so that "Google" shows up for the label in global search, but "Google Search" shows up as the name in 'manage applications'.
tree: 906fcfee4daf1398b5410f3a877fab063a55ff67
  1. res/
  2. src/
  3. Android.mk
  4. AndroidManifest.xml
  5. MODULE_LICENSE_APACHE2
  6. NOTICE