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

Merge commit '00b422c2ede1c43921f02a958ee20786361f889a'

* commit '00b422c2ede1c43921f02a958ee20786361f889a':
  Put launcher2 back into its own process.  bug 2241963