am cbca9344: am 497c8938: Merge change I24a40dc2 into eclair

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

* commit 'cbca934496ffa7305190fafa85aac7a5c69f2fde':
  Put launcher2 back into its own process.  bug 2241963
tree: 23a78174a20ebeb9a5c394cce0e9a549472fb5ce
  1. res/
  2. src/
  3. Android.mk
  4. AndroidManifest.xml
  5. MODULE_LICENSE_APACHE2
  6. NOTICE