commit 98d791cb052f7d1ba8edb7042ffcd20968d38656
author The Android Open Source Project <initial-contribution@android.com> Fri Feb 05 14:23:32 2010 -0800
committer Android Git Automerger <android-git-automerger@android.com> Fri Feb 05 14:23:32 2010 -0800
tree 092721e2d8499e1c9f0588b45492a868ee661d52
parent 53dfa9332c64db59155f30f049a716b0bce4cbe2
parent e193df4b6c34ac4d8ee1c75f77cefae0ceb815e7

am 0af04493: am 31bfdf69: reconcile main tree with open-source eclair

Merge commit '0af0449301e72a52beeed8f26021e5460004d67a'

* commit '0af0449301e72a52beeed8f26021e5460004d67a':
  android-2.1_r1 snapshot
  Use 128p map tiles for high dpi devices.
  Throttle nitz updates as the are too numerous on cdma.
  don't request a sync when temp providers are created
  Increase light sensor delay from one to two seconds.
  Revert jparks code from IPCThreadState.
  Add a warning when we leave threads in the binder thread pool in the background scheduling group.
  PowerManagerService: Ensure that recent changes do not effect the hardware ALS case.