tree 5b2e9b5aad22f1174f7ee803ab01276d35384042
parent ba123358673d82eb8959407d72fc58ad1094bb42
parent cb5f194409c2111f2729fc2ddd467e3c72316046
author Jean-Baptiste Queru <jbq@google.com> 1258326522 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1258326522 -0800

am ce757d69: merge from open-source master

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