Robert Greenwalt
7972d26cec
am 348297ab: Merge "Start using IP tool for advanced routing." into ics-mr0
...
* commit '348297abc0e03fb87a1d22465020b580d83fdd61':
Start using IP tool for advanced routing.
2011-11-04 22:55:30 +00:00
Robert Greenwalt
edc0bf5536
Merge "Start using IP tool for advanced routing." into ics-mr0
2011-11-04 15:53:37 -07:00
The Android Automerger
31f4de3e67
merge in ics-mr0-release history after reset to ics-mr0
2011-11-04 15:40:13 -07:00
Mathias Agopian
4a9ac37fe2
Fix rotation displays frame N-1 briefly while rotating
...
The ScreenShot layer is now created hidden. The screenshot itself
is aquired during the transaction when the layer is made visible.
This guarantees the screenshot and the layer happen atomically
with respect to screen updates.
Bug: 5534521
Change-Id: Ida23e1f13d5716ec83b78a15712e0646d6cf8729
2011-11-04 15:15:32 -07:00
Jamie Gennis
33e55a9545
Merge "EGL: Add stubs for EGL_ANDROID_blob_cache" into ics-mr1
2011-11-04 15:10:11 -07:00
Jamie Gennis
aca51c06f3
EGL: Add stubs for EGL_ANDROID_blob_cache
...
This change adds a stub cache implementation that gets passed to the
underlying EGL implementation at initialization time.
Change-Id: I14437c5b6f91b7a34a19bb02ad802e6e54f88d2a
2011-11-04 15:01:51 -07:00
Dianne Hackborn
e76a881d78
am ca250167: (-s ours) Merge "DO NOT MERGE. Integrate: Include showmap output in bug report." into ics-mr0
...
* commit 'ca25016775391bf71f7503aeb61798df46fa54cf':
DO NOT MERGE. Integrate: Include showmap output in bug report.
2011-11-04 21:01:40 +00:00
Dianne Hackborn
d0af48a2a4
Merge "DO NOT MERGE. Integrate: Include showmap output in bug report." into ics-mr0
2011-11-04 14:00:21 -07:00
Dave Burke
f11ecc7c72
am 3ee47188: Frame rate to 48 fps
...
* commit '3ee471889b09d90affddd00c409a515a64b6861b':
Frame rate to 48 fps
2011-11-04 20:55:30 +00:00
Mathias Agopian
d9440fe166
Merge "fix an issue where SensorService could request an invalid sensor delay" into ics-mr1
2011-11-04 12:13:36 -07:00
Irfan Sheriff
9fbfb87f2d
Merge "Avoid quick shutdown after a driver start" into ics-mr1
2011-11-04 11:47:27 -07:00
Narayan Kamath
e5a4dc2bb3
Merge "Add an API for querying / enabling network TTS support." into ics-mr1
2011-11-04 11:01:57 -07:00
Chet Haase
a9c23ad3d8
Merge "Improve Launcher drag performance." into ics-mr1
2011-11-04 11:01:25 -07:00
Dianne Hackborn
5a5206c61f
Merge "Include showmap output in bug report." into ics-mr1
2011-11-04 10:46:09 -07:00
Amith Yamasani
d4a8083581
Merge "Close suggestions cursor when SearchView is detached." into ics-mr1
2011-11-04 10:41:10 -07:00
Flavio Lerda
47f3f725d0
Merge "Add a query parameter to look-up a SIP address." into ics-mr1
2011-11-04 09:48:18 -07:00
Eric Laurent
e2c4e9ba66
Merge "Fix device management in lvm effect bundle wrapper." into ics-mr1
2011-11-04 08:29:30 -07:00
Eric Laurent
44d5fa3aa5
Merge "Fix problem in lvm effect bundle wrapper." into ics-mr1
2011-11-04 08:27:45 -07:00
The Android Open Source Project
71d2a87466
am 8242cc49: Reconcile with ics-mr0-release ics-factoryrom-2-release
...
* commit '8242cc49a90aa13a4830a735438b6e3cf73ea0f0':
Revert "Merge "Avoid duplicate dialogs leading to NPE" into ics-mr0"
Revert "Merge "BatteryService(jni): properly handle read's return value" into ics-mr0"
Revert "Merge "Update camera continuous autofocus javadoc." into ics-mr0"
Revert "Merge "Fix potential segfault in RS watchdog." into ics-mr0"
Revert "Merge "Improve the slow query instrumentation." into ics-mr0"
2011-11-04 15:01:30 +00:00
The Android Open Source Project
2009c2f06c
Reconcile with ics-mr0-release ics-factoryrom-2-release
...
Change-Id: I81cf3b3994cb9a1c18fca3ce0049e09402543086
2011-11-04 07:56:43 -07:00
Wink Saville
c20a7f1a18
am 9ca0f122: am e4ca9242: Fix the build.
...
* commit '9ca0f1222711b4cce1de56c6623790165870392a':
Fix the build.
2011-11-04 12:04:09 +00:00
Dave Burke
d40e8d7923
am 43e72b1f: (-s ours) am 32b5a7ee: (-s ours) Merge "DO NOT MERGE Poll input data with a small timeout and don\'t consume a full core." into ics-mr0
...
* commit '43e72b1f5692dd9e220158001317c2abc0ecafcf':
DO NOT MERGE Poll input data with a small timeout and don't consume a full core.
2011-11-04 12:04:08 +00:00
Wink Saville
e71d620d70
am 8b771243: am 3d708451: Merge "Separate data stall detection and recovery from net stats." into ics-mr0
...
* commit '8b77124395713de5e09c9b56fac03c244513dc25':
Separate data stall detection and recovery from net stats.
2011-11-04 12:04:06 +00:00
Wink Saville
ee0e44271a
am e4ca9242: Fix the build.
...
* commit 'e4ca92421cc07c2f7f152b774dd1ac7a8944028b':
Fix the build.
2011-11-04 11:59:29 +00:00
Dave Burke
14c82e0af9
am 32b5a7ee: (-s ours) Merge "DO NOT MERGE Poll input data with a small timeout and don\'t consume a full core." into ics-mr0
...
* commit '32b5a7eeaf758fad0c24131603cdd54cd2883a58':
DO NOT MERGE Poll input data with a small timeout and don't consume a full core.
2011-11-04 11:59:27 +00:00
Wink Saville
e0d02e00bf
am 3d708451: Merge "Separate data stall detection and recovery from net stats." into ics-mr0
...
* commit '3d7084519b03da0681da13fb8d7d4a0914d11646':
Separate data stall detection and recovery from net stats.
2011-11-04 11:59:25 +00:00
Katie McCormick
dc2361e84f
am 6d77ad80: am 6c5951bf: Doc change: Updating device-admin with camera info.
...
* commit '6d77ad80375a82b97aefb7d5ab547a2944135edf':
Doc change: Updating device-admin with camera info.
2011-11-04 11:34:16 +00:00
Katie McCormick
f4af7e7467
am 6c5951bf: Doc change: Updating device-admin with camera info.
...
* commit '6c5951bf9798369d335096f1f73ee1299cf903ff':
Doc change: Updating device-admin with camera info.
2011-11-04 11:28:39 +00:00
Ken Wakasa
993ec1c38d
am 943f6d0b: Merge "Turn off the spell checker when the spell checker is disabled in the settings" into ics-mr1
...
* commit '943f6d0b33f599ed00b76c59b4a4b4c41d0e66f2':
Turn off the spell checker when the spell checker is disabled in the settings
2011-11-04 08:05:44 +00:00
Ken Wakasa
6d52d9c26c
Merge "Turn off the spell checker when the spell checker is disabled in the settings" into ics-mr1
2011-11-04 01:02:12 -07:00
Dave Burke
e11ccb28d1
Merge "DO NOT MERGE Poll input data with a small timeout and don't consume a full core." into ics-mr0
2011-11-03 21:59:20 -07:00
Wink Saville
de6499254b
Merge "Separate data stall detection and recovery from net stats." into ics-mr0
2011-11-03 21:26:35 -07:00
Jeff Brown
2ab79e755b
Slight change to the unwinder API.
...
Change-Id: I5424de76a21b74842e004e0281936b3f492d3c7a
2011-11-03 17:30:54 -07:00
Irfan Sheriff
8f260bafc0
am a3d9eba1: Merge "Reset IP failure counter on a success" into ics-mr1
...
* commit 'a3d9eba10461158a52acfc2a0324696b25db761f':
Reset IP failure counter on a success
2011-11-03 23:10:04 +00:00
Irfan Sheriff
c5e0f4ff35
Merge "Reset IP failure counter on a success" into ics-mr1
2011-11-03 16:06:07 -07:00
Christopher Tate
632d904941
am 4fdad1af: Merge "Add persistent property to disable strict mode" into ics-mr1
...
* commit '4fdad1af53ea46892f477185ff93d4182b7aadf9':
Add persistent property to disable strict mode
2011-11-03 23:04:43 +00:00
Christopher Tate
59c37194bb
Merge "Add persistent property to disable strict mode" into ics-mr1
2011-11-03 15:59:47 -07:00
Mangesh Ghiware
fc109ad55e
am 69957172: Merge "Update fix to restore view and text wrap scales." into ics-mr1
...
* commit '69957172fa8336e01a9ff07ab34deca2c553f0b4':
Update fix to restore view and text wrap scales.
2011-11-03 22:40:56 +00:00
Mangesh Ghiware
233691c340
Merge "Update fix to restore view and text wrap scales." into ics-mr1
2011-11-03 15:35:23 -07:00
Dianne Hackborn
ad2bff5100
am e0ad4746: Merge "Some optimizations for view inflation." into ics-mr1
...
* commit 'e0ad47465ededb16c6cd60524acd6941a8ce0bd8':
Some optimizations for view inflation.
2011-11-03 22:19:36 +00:00
Dianne Hackborn
fd5178892c
Merge "Some optimizations for view inflation." into ics-mr1
2011-11-03 15:16:11 -07:00
Kenny Root
ff2759d80f
am e24ac4b2: Merge "Update GET_UNINSTALLED_PACKAGES flag documentation" into ics-mr1
...
* commit 'e24ac4b219a582f1a99465551b1fd76345553b22':
Update GET_UNINSTALLED_PACKAGES flag documentation
2011-11-03 21:51:15 +00:00
Kenny Root
251d5b274f
Merge "Update GET_UNINSTALLED_PACKAGES flag documentation" into ics-mr1
2011-11-03 14:47:07 -07:00
Scott Main
c3329679a5
am cbf1437c: am 95142919: docs: dashboard update for 11/3
...
* commit 'cbf1437c9dc3080d4faa79be8612c3ef7387515e':
docs: dashboard update for 11/3
2011-11-03 21:10:49 +00:00
Scott Main
e5aa119222
am 95142919: docs: dashboard update for 11/3
...
* commit '9514291901e3a1274e30c2e809ad38e22e7f662e':
docs: dashboard update for 11/3
2011-11-03 21:06:29 +00:00
Marco Nelissen
e72e78cc78
am f51f1bd9: Verify we actually have valid utf8 metadata
...
* commit 'f51f1bd9d42d0dd55c120bfb83ed113b61e5c3ca':
Verify we actually have valid utf8 metadata
2011-11-03 20:18:37 +00:00
Jamie Gennis
eade85c60c
am c5ce130f: Merge "SurfaceTexture: various logging improvements" into ics-mr1
...
* commit 'c5ce130f658303299bf55091373951f7fd33ae36':
SurfaceTexture: various logging improvements
2011-11-03 18:57:21 +00:00
Jamie Gennis
7fbb39960e
am 236aea35: Merge changes Ibc99cb1c,Ie1f4f6f8 into ics-mr1
...
* commit '236aea3579787961fdd41d87574760b63323c0c1':
BlobCache: implement cache serialization
BlobCache: remove the mutex locking
2011-11-03 18:55:14 +00:00
Jamie Gennis
9f8b1cecc8
Merge "SurfaceTexture: various logging improvements" into ics-mr1
2011-11-03 11:51:38 -07:00
Jamie Gennis
3aed920fcc
Merge changes Ibc99cb1c,Ie1f4f6f8 into ics-mr1
...
* changes:
BlobCache: implement cache serialization
BlobCache: remove the mutex locking
2011-11-03 11:51:23 -07:00