diff options
| author | The Android Open Source Project <initial-contribution@android.com> | 2010-02-05 08:48:38 -0800 | 
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-02-05 08:48:38 -0800 | 
| commit | 0af0449301e72a52beeed8f26021e5460004d67a (patch) | |
| tree | 22bf8a53d79fc3c7909e1006f4189c52084a8a63 /opengl/java/android/opengl/Texture.java | |
| parent | dd24f599066d693722d53924b16f1cdb53aa7f8b (diff) | |
| parent | 31bfdf695ef741f64066ef605bd6a7e23df88714 (diff) | |
am 31bfdf69: reconcile main tree with open-source eclair
Merge commit '31bfdf695ef741f64066ef605bd6a7e23df88714' into eclair-plus-aosp
* commit '31bfdf695ef741f64066ef605bd6a7e23df88714':
  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.
  Fix regression.
  Fix broken build.
  Bluetooth A2DP suspend/resume functionality
  EventLog when a database file is deleted due to corruption.
  Don't forget to clear "backup in progress" state when finishing a pass
  Fix issue #2148939: Sholes slow to wake up in landscape mode
  Fix Cdma re-start of default connection.
  Merge change 26821 into eclair
  Not all WebView's host have permission to read the history.
  Merge change 26908 into eclair
Diffstat (limited to 'opengl/java/android/opengl/Texture.java')
0 files changed, 0 insertions, 0 deletions
