Merge commit 'ebd45e5ca9690110ecb50c26b0b791054ee4c0ef' into eclair-plus-aosp * commit 'ebd45e5ca9690110ecb50c26b0b791054ee4c0ef': Fix issue #2149145: Safe Mode does not work on Sholes device
Merge commit 'ebd45e5ca9690110ecb50c26b0b791054ee4c0ef' into eclair-plus-aosp * commit 'ebd45e5ca9690110ecb50c26b0b791054ee4c0ef': Fix issue #2149145: Safe Mode does not work on Sholes device