Merge change 21132 into donut

* changes:
  Replace app icon used in shortcuts selector menu with the new default app icon.
tree: 685783997d1a9d09242476d9179e6c7219eb4b7d
  1. res/
  2. src/
  3. Android.mk
  4. AndroidManifest.xml
  5. MODULE_LICENSE_APACHE2
  6. NOTICE