Merge change 1274 into donut

* changes:
  Modify comments in Launcher strings for global search.
tree: 782dc3e58f8c5fc4c6651baf10c3fb90b42c72d1
  1. res/
  2. src/
  3. Android.mk
  4. AndroidManifest.xml
  5. MODULE_LICENSE_APACHE2
  6. NOTICE