am 7e76b6d1: am 6d00151c: Merge "Hopefully fix issue #2662536: Why is launcher...
am 7e76b6d1: am 6d00151c: Merge "Hopefully fix issue #2662536: Why is launcher being killed?" into froyo
Merge commit '7e76b6d1' into kraken
* commit '7e76b6d1':
Hopefully fix issue #2662536: Why is launcher being killed?