Eric Fischer
90193fb81e
am 58ad16cf: Merge "Import revised translations. DO NOT MERGE" into ics-mr1
...
* commit '58ad16cfeaac1c2124d0f9e9d2b5c493e163128c':
Import revised translations. DO NOT MERGE
2011-12-06 10:36:30 -08:00
Eric Fischer
36a9a06f12
Merge "Import revised translations. DO NOT MERGE" into ics-mr1
2011-12-06 10:34:41 -08:00
Svetoslav Ganov
618a136015
am ea25ea7e: Merge "Adding a system preference whether to speak passwords in accessibility mode." into ics-mr1
...
* commit 'ea25ea7ef30be14dd940f1667e0308bfff5b4d85':
Adding a system preference whether to speak passwords in accessibility mode.
2011-12-06 10:29:13 -08:00
Svetoslav Ganov
d10d9b0c05
Merge "Adding a system preference whether to speak passwords in accessibility mode." into ics-mr1
2011-12-06 10:27:04 -08:00
Jeff Brown
c18c2b28f9
am 4079702a: Merge "Fix memory corruption issues in TextLayoutCache. (DO NOT MERGE)" into ics-mr1
...
* commit '4079702ac27b51282a25de5f7c20f6fba6b71995':
Fix memory corruption issues in TextLayoutCache. (DO NOT MERGE)
2011-12-05 22:52:20 -08:00
Jeff Brown
3e22f421dc
Merge "Fix memory corruption issues in TextLayoutCache. (DO NOT MERGE)" into ics-mr1
2011-12-05 22:50:49 -08:00
Jim Miller
74015225ec
am 17f9fe13: Merge "Fix 5705837: Dismiss keyguard when launching Settings from Statusbar" into ics-mr1
...
* commit '17f9fe13c7c78eaab521f6f85b48b0e8f5adddbc':
Fix 5705837: Dismiss keyguard when launching Settings from Statusbar
2011-12-05 22:14:37 -08:00
Jim Miller
a389059345
Merge "Fix 5705837: Dismiss keyguard when launching Settings from Statusbar" into ics-mr1
2011-12-05 22:12:54 -08:00
Jesse Hall
4759837dd3
am 3e7b412d: Merge "Fix statusbar crash on devices with no Bluetooth" into ics-mr1
...
* commit '3e7b412d7d6332830ceaf123edb5e211757c69ce':
Fix statusbar crash on devices with no Bluetooth
2011-12-05 21:24:53 -08:00
Jesse Hall
ed7d42a38c
Merge "Fix statusbar crash on devices with no Bluetooth" into ics-mr1
2011-12-05 21:23:29 -08:00
Matthew Xie
5f2dca5822
am 0d9a41e7: Merge "Broadcast turning on/off intent as early as possible when switch on/off BT" into ics-mr1
...
* commit '0d9a41e74c81e8297ee439473c301a50da20cf0b':
Broadcast turning on/off intent as early as possible when switch on/off BT
2011-12-05 19:58:12 -08:00
Matthew Xie
7f87a886c2
Merge "Broadcast turning on/off intent as early as possible when switch on/off BT" into ics-mr1
2011-12-05 19:56:54 -08:00
Dianne Hackborn
4e6a13e794
am 0c0120ef: Merge "Fix issue #5714517 : App shortcuts can result in bad task intents" into ics-mr1
...
* commit '0c0120efa2dedaf25ae789bced5a3f9fa33c32bb':
Fix issue #5714517 : App shortcuts can result in bad task intents
2011-12-05 19:18:34 -08:00
Dianne Hackborn
de63dc278a
Merge "Fix issue #5714517 : App shortcuts can result in bad task intents" into ics-mr1
2011-12-05 19:16:54 -08:00
Dianne Hackborn
6d28bf7b30
am 52245ac7: Merge "Fix issue #5713576 : Home redraws after returning from app on Nexus S 4G" into ics-mr1
...
* commit '52245ac7c41735c561199d9ec7e9577d592ca852':
Fix issue #5713576 : Home redraws after returning from app on Nexus S 4G
2011-12-05 19:09:17 -08:00
Dianne Hackborn
e7c5236937
Merge "Fix issue #5713576 : Home redraws after returning from app on Nexus S 4G" into ics-mr1
2011-12-05 19:07:52 -08:00
Daniel Sandler
481458b522
am f66664a5: Merge "Fix sticky menu icon on tablet status bar." into ics-mr1
...
* commit 'f66664a50e914e1cc5d66046cfc4c5b195a09eab':
Fix sticky menu icon on tablet status bar.
2011-12-05 19:04:13 -08:00
Daniel Sandler
a13e242710
Merge "Fix sticky menu icon on tablet status bar." into ics-mr1
2011-12-05 19:02:28 -08:00
Adam Powell
757108a9d2
am 9a856f4e: Merge "Drop API level for notification compatibility BG to 8 (from 10)" into ics-mr1
...
* commit '9a856f4ee7b49f735e31b57a09bee2f033ce20a5':
Drop API level for notification compatibility BG to 8 (from 10)
2011-12-05 17:40:18 -08:00
Adam Powell
64fb290a92
Merge "Drop API level for notification compatibility BG to 8 (from 10)" into ics-mr1
2011-12-05 17:38:23 -08:00
Eric Laurent
19c54add1d
am 7b6aff23: Merge "audioflinger: fix audio skipping over A2DP" into ics-mr1
...
* commit '7b6aff23735a9ef8759c5ecb4427784413e9b85b':
audioflinger: fix audio skipping over A2DP
2011-12-05 17:22:58 -08:00
Eric Laurent
cb512470c5
Merge "audioflinger: fix audio skipping over A2DP" into ics-mr1
2011-12-05 17:20:53 -08:00
Fred Quintana
0a5867d5bd
am b5f2dfbc: Merge "By default ICS allows two syncs to run in parallel. Make it only do one at a time for devices that don\'t have much RAM as defined by the call ActivityManager.isLargeRAM()" into ics-mr1
...
* commit 'b5f2dfbc221d3dc799232e0ada3b6621d3d4d597':
By default ICS allows two syncs to run in parallel. Make it only do one at a time for devices that don't have much RAM as defined by the call ActivityManager.isLargeRAM()
2011-12-05 16:47:06 -08:00
Fred Quintana
9a6f415353
Merge "By default ICS allows two syncs to run in parallel. Make it only do one at a time for devices that don't have much RAM as defined by the call ActivityManager.isLargeRAM()" into ics-mr1
2011-12-05 16:45:29 -08:00
Michael Kolb
d694297171
am 3124e6f9: Merge "Remove debug log messages" into ics-mr1
...
* commit '3124e6f9e96b730cdfbbf068f15c41b6d5c8a819':
Remove debug log messages
2011-12-05 16:13:49 -08:00
Michael Kolb
fcc6543339
Merge "Remove debug log messages" into ics-mr1
2011-12-05 16:12:35 -08:00
Xia Wang
196a6826fb
am e63d67ef: Merge "Add extra 2 minute for wifi to shutdown" into ics-mr1
...
* commit 'e63d67eff794ba2e4e5d2aa9e8854b37329f4429':
Add extra 2 minute for wifi to shutdown
2011-12-05 15:55:27 -08:00
Xia Wang
89b1dac8b1
Merge "Add extra 2 minute for wifi to shutdown" into ics-mr1
2011-12-05 15:52:34 -08:00
Svetoslav Ganov
3e458eabf4
am da926cf2: Merge "TalkBack does not announce properly the buttons of the PIN lock." into ics-mr1
...
* commit 'da926cf284ff5f5ccf91dec088ff64d442cee25c':
TalkBack does not announce properly the buttons of the PIN lock.
2011-12-05 15:04:31 -08:00
Svetoslav Ganov
797fca9027
Merge "TalkBack does not announce properly the buttons of the PIN lock." into ics-mr1
2011-12-05 15:03:13 -08:00
Irfan Sheriff
2f04882c54
am 6b66e9e4: Switch to notifications for walled garden
...
* commit '6b66e9e4c95b1c866ea63a0122fc199994fd7053':
Switch to notifications for walled garden
2011-12-05 14:22:03 -08:00
Peter Ng
46c14cdf18
am 74b496dd: Merge "Numberpicker section divider is now 2dp thick" into ics-mr1
...
* commit '74b496dd8aab7e29bcba0c6502f773555c4ce29f':
Numberpicker section divider is now 2dp thick
2011-12-05 12:36:24 -08:00
Peter Ng
98c0f73407
Merge "Numberpicker section divider is now 2dp thick" into ics-mr1
2011-12-05 12:34:53 -08:00
Eric Fischer
4a71665321
am 845b3efc: Merge "Add missing locale date format files." into ics-mr1
...
* commit '845b3efc9935e66b718d8e9a56435bf039f97633':
Add missing locale date format files.
2011-12-05 12:28:06 -08:00
Eric Fischer
b593c4b82e
Merge "Add missing locale date format files." into ics-mr1
2011-12-05 12:25:58 -08:00
Andreas Huber
8e2bb37d9f
am f2e12498: Merge "Properly identify how much metadata we need to cache in order to instantiate" into ics-mr1
...
* commit 'f2e1249846a17c69d728189a8dc67f37261f0a59':
Properly identify how much metadata we need to cache in order to instantiate
2011-12-05 12:03:41 -08:00
Andreas Huber
3174be1013
Merge "Properly identify how much metadata we need to cache in order to instantiate" into ics-mr1
2011-12-05 12:01:26 -08:00
Dianne Hackborn
41342e8326
am 003c15d7: Merge "Fix issue #5614559 : Registering surface error in..." into ics-mr1
...
* commit '003c15d72ccd3856d5abfe6d66a2a40d0eca85bc':
Fix issue #5614559 : Registering surface error in...
2011-12-05 10:42:51 -08:00
Dianne Hackborn
72516bcb52
Merge "Fix issue #5614559 : Registering surface error in..." into ics-mr1
2011-12-05 10:40:59 -08:00
Michael Kolb
2d1cccda6c
am 277cbe5a: Merge "set System UI visibility based on MediaController state" into ics-mr1
...
* commit '277cbe5a951840558166020568fb1510285e2594':
set System UI visibility based on MediaController state
2011-12-05 09:26:21 -08:00
Michael Kolb
d5de02094d
Merge "set System UI visibility based on MediaController state" into ics-mr1
2011-12-05 09:24:25 -08:00
Jesse Hall
19a586f70a
am f57c1388: Merge "SurfaceFlinger: fix layer removal race condition" into ics-mr1
...
* commit 'f57c1388860486a70cc773f2cfeaa3ea3b38a473':
SurfaceFlinger: fix layer removal race condition
2011-12-02 18:33:14 -08:00
Jesse Hall
7d9f44c2f0
Merge "SurfaceFlinger: fix layer removal race condition" into ics-mr1
2011-12-02 18:31:03 -08:00
Robert Greenwalt
b3e9629420
am 2a7b5ab1: Merge "Be careful sharing connections when dun is in play" into ics-mr1
...
* commit '2a7b5ab16af697f386ad7ae346e1bf9229086fa8':
Be careful sharing connections when dun is in play
2011-12-02 16:54:04 -08:00
Robert Greenwalt
d76faf3963
Merge "Be careful sharing connections when dun is in play" into ics-mr1
2011-12-02 16:52:29 -08:00
Gilles Debunne
d934573021
am 2f1e1e4a: Merge "Handle animations in Views\' rectangle clipping methods." into ics-mr1
...
* commit '2f1e1e4ab9ca20920d85574317c9d7c9e9e73161':
Handle animations in Views' rectangle clipping methods.
2011-12-02 15:31:07 -08:00
Gilles Debunne
557266f89a
Merge "Handle animations in Views' rectangle clipping methods." into ics-mr1
2011-12-02 15:28:56 -08:00
John Reck
d8c16f2266
am 43bc6b09: Merge "Fix updateDoubleTapZoom logic" into ics-mr1
...
* commit '43bc6b094edda6baa8123115a33afaf454525376':
Fix updateDoubleTapZoom logic
2011-12-02 14:49:19 -08:00
John Reck
4ca57ef165
Merge "Fix updateDoubleTapZoom logic" into ics-mr1
2011-12-02 14:47:04 -08:00
Mike Lockwood
f9d67a9081
am 1a3ece9f: Merge "MTP: Add support for restricting PTP to only certain subdirectories of the storage DO NOT MERGE" into ics-mr1
...
* commit '1a3ece9f871c94eb524543ae618a2a1c88cab2cd':
MTP: Add support for restricting PTP to only certain subdirectories of the storage DO NOT MERGE
2011-12-02 13:22:17 -08:00