am c7a21b5: Merge change 1274 into donut

Merge commit 'c7a21b5fe07837a1146f9781c1787100b8c04e84'

* commit 'c7a21b5fe07837a1146f9781c1787100b8c04e84':
  Modify comments in Launcher strings for global search.
tree: eb32c6e96ad3d5d9c9a01ebfba482e77d458a64a
  1. res/
  2. src/
  3. Android.mk
  4. AndroidManifest.xml
  5. MODULE_LICENSE_APACHE2
  6. NOTICE