Jeff Sharkey
b1a6d8568b
am 9427d688: am db0ab2e7: Merge "Process AMS events in NetworkPolicy handler." into ics-mr0
...
* commit '9427d688bda2d5b177112a58dcfdbcdfdfe98559':
Process AMS events in NetworkPolicy handler.
2011-11-02 17:50:25 +00:00
Dianne Hackborn
4be28392c9
am 39cec406: Merge "Add new OOM adjustment for the "previous" process." into ics-mr1
...
* commit '39cec40697ab3d1d106e0c0c21458b2085c96f00':
Add new OOM adjustment for the "previous" process.
2011-11-02 17:50:23 +00:00
Fabrice Di Meglio
366464d48d
am 07b4b314: am bcf05a69: Fix bug #5553401 TextLayoutCache is too verbose: "computeValuesWithHarfbuzz -- need to force to single run"
...
* commit '07b4b3145333bc8ece9fdbb68ade726b3d6485cd':
Fix bug #5553401 TextLayoutCache is too verbose: "computeValuesWithHarfbuzz -- need to force to single run"
2011-11-02 17:50:18 +00:00
Dianne Hackborn
8315445a44
am ad41a94b: Merge "Some optimizations." into ics-mr1
...
* commit 'ad41a94b298f834e13632ee29b27cefd75f10012':
Some optimizations.
2011-11-02 17:50:14 +00:00
Adam Powell
f0dab34963
am 2eca6133: Merge "Fix bug 5528574 - "View not attached to window manager" upon orientation change when there is a dialog with ActionMode on" into ics-mr1
...
* commit '2eca6133b69db0a649b8429dcef4ed46b209bf41':
Fix bug 5528574 - "View not attached to window manager" upon orientation change when there is a dialog with ActionMode on
2011-11-02 17:50:12 +00:00
Katie McCormick
b8e040bafc
am 46a10ee0: am d5b25ecc: Merge "Doc Update: Update list of widget classes" into ics-mr0
...
* commit '46a10ee08d0e51c97923c8e3c54513d228b42467':
Doc Update: Update list of widget classes
2011-11-02 17:42:41 +00:00
Dima Zavin
98b5619d17
am a9656df5: am f0ad147f: Merge "BatteryService(jni): properly handle read\'s return value" into ics-mr0
...
* commit 'a9656df58f75946f3eab4dd660df56c9d878a04e':
BatteryService(jni): properly handle read's return value
2011-11-02 17:31:47 +00:00
The Android Open Source Project
a37fb0506d
am a0d5bece: Reconcile with ics-mr0-release
...
* commit 'a0d5bece38f3b8fb430f3fb996e7baefb78d8602':
2011-11-02 17:31:43 +00:00
Mangesh Ghiware
ee3b6d2090
am 274133df: Merge "Fix setInitialScale() to take display density into account." into ics-mr1
...
* commit '274133dfef84f93de349fcd34919f4df32279e8a':
Fix setInitialScale() to take display density into account.
2011-11-02 17:31:38 +00:00
Eric Fischer
7f19c817e1
am abf75396: (-s ours) Merge "Import revised translations. DO NOT MERGE" into ics-mr1
...
* commit 'abf7539642a7c3d8d31c1d12d705b54cf155db1a':
Import revised translations. DO NOT MERGE
2011-11-02 17:31:35 +00:00
Michael Jurka
676cfd1fc6
am 93430b3c: Merge "Fix: never show recents over lock screen" into ics-mr1
...
* commit '93430b3c6d170bf1db538c21666e0b508e8e48ec':
Fix: never show recents over lock screen
2011-11-02 17:31:33 +00:00
Peter Ng
cab846e90b
am 80c3c87f: Merge "Asset updates for tablet notifications and layout fixes to quicksettings" into ics-mr1
...
* commit '80c3c87ff08e77c3bcbd14f003e296bed9adba55':
Asset updates for tablet notifications and layout fixes to quicksettings
2011-11-02 17:31:15 +00:00
Fabrice Di Meglio
236b8cc407
am 3b8d33b1: (-s ours) Merge "Fix bug #5504346 Hung in native_getTextRunAdvances - DO NOT MERGE" into ics-mr1
...
* commit '3b8d33b131956f3a1b41c15dbe07b1b2d7f44086':
Fix bug #5504346 Hung in native_getTextRunAdvances - DO NOT MERGE
2011-11-02 17:31:07 +00:00
Robert Greenwalt
edec2d2087
am 852d72b2: am bd9b1528: Merge "Add cdma_rmnet4 to list of monitored interfaces" into ics-mr0
...
* commit '852d72b28e6d7d0e6372a9b544641817338002e6':
Add cdma_rmnet4 to list of monitored interfaces
2011-11-02 17:31:06 +00:00
Daniel Sandler
2173a076cb
am 7775f52e: Merge "Bring timestamps back to notifications." into ics-mr1
...
* commit '7775f52e4aa7703a5721378f5a1103d9486af895':
Bring timestamps back to notifications.
2011-11-02 17:30:42 +00:00
Jim Miller
dae4c33e42
am a67217c3: Merge "Fix 5404916: Make layout fit on 480x800 hdpi device" into ics-mr1
...
* commit 'a67217c35ec43e06598b71feae63ce675fa9cac7':
Fix 5404916: Make layout fit on 480x800 hdpi device
2011-11-02 17:30:40 +00:00
Fabrice Di Meglio
b3d3918b28
am deb15704: (-s ours) am 46e327ca: (-s ours) Merge "Fix bug #5504346 Hung in native_getTextRunAdvances - DO NOT MERGE" into ics-mr0
...
* commit 'deb15704e9abcfc71bb81a358ff3bb239896474d':
Fix bug #5504346 Hung in native_getTextRunAdvances - DO NOT MERGE
2011-11-02 17:30:39 +00:00
Mangesh Ghiware
14509a4b01
am 00ef15b9: Merge "Clamp initial scale between minimum and maximum values." into ics-mr1
...
* commit '00ef15b98ac0579ebd5f81a1753bc18384e88b8b':
Clamp initial scale between minimum and maximum values.
2011-11-02 17:30:34 +00:00
Adam Powell
bc3de80d35
am ca4100da: Merge "Fix bug 5534667 - Action bar icons need more space on tablet" into ics-mr1
...
* commit 'ca4100da0a0481b3b9f464bbc8842b571e8c60d5':
Fix bug 5534667 - Action bar icons need more space on tablet
2011-11-02 17:30:29 +00:00
Dianne Hackborn
937017fbea
am f136aa34: Merge "Various performance and other work." into ics-mr1
...
* commit 'f136aa341abaaf7fd6f7632d41a30b2989d93985':
Various performance and other work.
2011-11-02 17:30:26 +00:00
Peter Ng
b57b20912a
am 374e23bd: Merge "spinner focused states pumped up" into ics-mr1
...
* commit '374e23bd11c42e7e472d2490a3dfddb7df198a66':
spinner focused states pumped up
2011-11-02 17:30:25 +00:00
The Android Open Source Project
0dac3e6d17
am a0824452: am 9eb4c891: Reconcile with ics-factoryrom-2-release
...
* commit 'a0824452d5c511acc7d11396ff2e6423f7b03948':
Revert "Merge "Improve the slow query instrumentation." into ics-mr0"
2011-11-02 17:30:20 +00:00
Philip Milne
88c6ccb00d
am 3617933b: Merge " Update to fix for bug 5393156" into ics-mr1
...
* commit '3617933bee5a977a7e6c8f8f4b75e580f8bf2ebf':
Update to fix for bug 5393156
2011-11-02 17:30:11 +00:00
Jim Miller
1f3dfa3810
am 22726020: am 1dce37bd: Merge "Fix 5497305: Make sure we show SIM unlock when "None" is selected" into ics-mr0
...
* commit '2272602032e5051d5067a7a95c741304468a81af':
Fix 5497305: Make sure we show SIM unlock when "None" is selected
2011-11-02 17:29:49 +00:00
Chih-Chung Chang
1f0081d21d
am 11ba6da4: am 4b6353ea: Merge "Update camera continuous autofocus javadoc." into ics-mr0
...
* commit '11ba6da460572b9ce9cb9dc0d5a76b710e7efdb3':
Update camera continuous autofocus javadoc.
2011-11-02 17:29:46 +00:00
satok
e476c696ba
am ff93e417: Merge "Resolve memory leak in TextServicesManagerService" into ics-mr1
...
* commit 'ff93e417a217703a635d8601b835853e07233afd':
Resolve memory leak in TextServicesManagerService
2011-11-02 17:29:35 +00:00
Adam Powell
23f43666f1
am b1db20bd: Merge "Fix bug 5514022 - ListView should not auto-scroll selected item to top when gaining focus" into ics-mr1
...
* commit 'b1db20bde5e00c8cdd1a97b07ddcc41f321d3db8':
Fix bug 5514022 - ListView should not auto-scroll selected item to top when gaining focus
2011-11-02 17:29:33 +00:00
Stephen Hines
3c5f1610c7
am af3a854b: am af675222: Merge "Fix potential segfault in RS watchdog." into ics-mr0
...
* commit 'af3a854b549409c4ad77c686e860f97ea86706a0':
Fix potential segfault in RS watchdog.
2011-11-02 17:29:30 +00:00
Jeff Sharkey
1b0401f996
am db0ab2e7: Merge "Process AMS events in NetworkPolicy handler." into ics-mr0
...
* commit 'db0ab2e731d755f64583c5704fa406bc0e7a2af4':
Process AMS events in NetworkPolicy handler.
2011-11-02 04:16:13 +00:00
Jeff Sharkey
a8f0322f70
Merge "Process AMS events in NetworkPolicy handler." into ics-mr0
2011-11-01 21:14:35 -07:00
Dianne Hackborn
dd196eca67
Merge "Add new OOM adjustment for the "previous" process." into ics-mr1
2011-11-01 21:11:18 -07:00
Fabrice Di Meglio
d7158de84d
am bcf05a69: Fix bug #5553401 TextLayoutCache is too verbose: "computeValuesWithHarfbuzz -- need to force to single run"
...
* commit 'bcf05a69090f342d328f1537d1d83406b883290b':
Fix bug #5553401 TextLayoutCache is too verbose: "computeValuesWithHarfbuzz -- need to force to single run"
2011-11-02 02:17:48 +00:00
Dianne Hackborn
625b34ebc1
Merge "Some optimizations." into ics-mr1
2011-11-01 18:02:44 -07:00
Adam Powell
ca45414224
Merge "Fix bug 5528574 - "View not attached to window manager" upon orientation change when there is a dialog with ActionMode on" into ics-mr1
2011-11-01 17:27:26 -07:00
Fabrice Di Meglio
5620c54c07
Merge "Fix bug #5438102 Double Arabic harakat overlap instead of stack In TextView"
2011-11-01 17:25:22 -07:00
Katie McCormick
7400517e63
am d5b25ecc: Merge "Doc Update: Update list of widget classes" into ics-mr0
...
* commit 'd5b25ecc07efb9d7f725731f29241217266b4c0c':
Doc Update: Update list of widget classes
2011-11-02 00:11:01 +00:00
Katie McCormick
84b955e66f
Merge "Doc Update: Update list of widget classes" into ics-mr0
2011-11-01 17:09:44 -07:00
Dima Zavin
a9c14ee513
am f0ad147f: Merge "BatteryService(jni): properly handle read\'s return value" into ics-mr0
...
* commit 'f0ad147fc33cf55cd9427010b2cdb3eb89b9eec3':
BatteryService(jni): properly handle read's return value
2011-11-01 22:32:06 +00:00
Dima Zavin
2ea1501028
Merge "BatteryService(jni): properly handle read's return value" into ics-mr0
2011-11-01 15:29:42 -07:00
Eric Laurent
b8432cce3b
am cd84197a: am 6e91e5b6: Merge "Fix volume indication in vibrate mode." into ics-mr0
...
* commit 'cd84197ac1226432de2e13c8fd678a4c88511e0f':
Fix volume indication in vibrate mode.
2011-11-01 21:59:18 +00:00
Martijn Coenen
3a333712a9
am b288f993: am 1eca250b: Merge "Fix disableForegroundNdefPush crash." into ics-mr0
...
* commit 'b288f99334348a21ffb465b37a4522998b452410':
Fix disableForegroundNdefPush crash.
2011-11-01 21:59:16 +00:00
Pannag Sanketi
a940a14b5e
am dd79b4c8: Merge "Expose video stabilization API" into ics-mr1
...
* commit 'dd79b4c85a9dd2c2ad702ea2137fe2a076567fa1':
Expose video stabilization API
2011-11-01 21:59:09 +00:00
Svetoslav Ganov
45f90c6209
am 62015f5d: am aeb11b59: Merge "Folding Accessibility Service sample into ApiDemos." into ics-mr0
...
* commit '62015f5d0d1104dfc682b3eb3b6c0be4f63b985a':
Folding Accessibility Service sample into ApiDemos.
2011-11-01 21:58:52 +00:00
The Android Open Source Project
8ee99aad34
Reconcile with ics-mr0-release
...
Change-Id: I14f9c7648ae8cc7403a6c605d12aba8eec553e80
2011-11-01 14:28:57 -07:00
Mangesh Ghiware
ce3b88b145
Merge "Fix setInitialScale() to take display density into account." into ics-mr1
2011-11-01 14:02:05 -07:00
Eric Fischer
529d127495
Merge "Import revised translations. DO NOT MERGE" into ics-mr1
2011-11-01 13:53:14 -07:00
Michael Jurka
f641d134a6
Merge "Fix: never show recents over lock screen" into ics-mr1
2011-11-01 13:53:02 -07:00
Peter Ng
a5268c55aa
Merge "Asset updates for tablet notifications and layout fixes to quicksettings" into ics-mr1
2011-11-01 13:45:18 -07:00
Fabrice Di Meglio
05c74c26fb
Merge "Fix bug #5504346 Hung in native_getTextRunAdvances - DO NOT MERGE" into ics-mr1
2011-11-01 13:30:24 -07:00
Robert Greenwalt
9f0f58fa6b
am bd9b1528: Merge "Add cdma_rmnet4 to list of monitored interfaces" into ics-mr0
...
* commit 'bd9b1528051a1b257768fdbc5077a2d4473b02dd':
Add cdma_rmnet4 to list of monitored interfaces
2011-11-01 20:29:42 +00:00