am cb44b4d4: am a1b02556: Merge change I3134655d into eclair

Merge commit 'cb44b4d475500b4a2ced729ae64d6d87f46f09b7' into eclair-mr2-plus-aosp

* commit 'cb44b4d475500b4a2ced729ae64d6d87f46f09b7':
  More capabilities for default home configuration
tree: fceca393b27432000723509d4181660c5843eebd
  1. res/
  2. src/
  3. Android.mk
  4. AndroidManifest.xml
  5. MODULE_LICENSE_APACHE2
  6. NOTICE