From: The Android Open Source Project <initial-contribution@android.com>
Date: Fri, 5 Feb 2010 22:23:32 +0000 (-0800)
Subject: am 0af04493: am 31bfdf69: reconcile main tree with open-source eclair
X-Git-Url: https://git.saurik.com/android/aapt.git/commitdiff_plain/59302c96c6ad1258529cdf052d4a4a71d474e85d?ds=inline;hp=--cc

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.
---

59302c96c6ad1258529cdf052d4a4a71d474e85d