commit b097973491a35e392370f3f2ab8a24dce84506cf
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 a38b12ed0b202c1e64edbd0bf78c8d6607cf9cf8
parent 0c4828c25de258e0c30e6b9ac2cb154fbea005ac
parent 9b2534cf5610f6680f9ed50cd265479a51d66259

am 9b2534cf: am acfd2380: reconcile main tree with open-source eclair

Merge commit '9b2534cf5610f6680f9ed50cd265479a51d66259'

* commit '9b2534cf5610f6680f9ed50cd265479a51d66259':
  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.