241c40b5a8
Merge commit 'ce757d693ebc5fee327e3f13c352bbd0c0cf4dea' * commit 'ce757d693ebc5fee327e3f13c352bbd0c0cf4dea': Fix 2209086: Fix missing callback that was preventing tab bar text from updating. always preserve rows for accounts with type of localhost even if the account manager doesn't know about them Fix 2262069: Cosmetic change - shift DigitalClock down to provide room for carrier. Fix a race condition that resulted in the screen coming on without the brightness set to the correct value. PowerManagerService: Hold a wakelock while mProximityTask is queued eclair snapshot