repo sync d28fcd5bb8 resolved conflicts for merge of efd91d7c to eclair-mr2-plus-aosp ...

Signed-off-by: repo sync <lockwood@android.com>

2009-11-18 20:13:09 -05:00

..

am

am 92b18800: am ab5efde8: Merge change Iff5b8ce3 into eclair

2009-11-16 20:04:09 -08:00

status

Fix bug 2252145 - Notification panel not closing completely when a call comes in

2009-11-17 10:43:37 -08:00

AccessibilityManagerService.java

…

AlarmManagerService.java

…

AppWidgetService.java

…

AttributeCache.java

…

BackupManagerService.java

…

BatteryService.java

…

BootReceiver.java

Add boot events (SYSTEM_LAST_KMSG and friends) to the dropbox.

2009-11-17 18:00:48 -08:00

BrickReceiver.java

…

ClipboardService.java

…

ConnectivityService.java

…

DemoDataSet.java

…

DeviceStorageMonitorService.java

…

DockObserver.java

…

DropBoxManagerService.java

Add boot events (SYSTEM_LAST_KMSG and friends) to the dropbox.

2009-11-17 18:00:48 -08:00

EntropyService.java

…

FallbackCheckinService.java

…

HardwareService.java

…

HeadsetObserver.java

…

InputDevice.java

…

InputMethodManagerService.java

…

Installer.java

…

IntentResolver.java

…

JournaledFile.java

…

KeyInputQueue.java

Fix issue #2249821: Unable to start passion in safe mode

2009-11-18 11:42:32 -08:00

LoadAverageService.java

…

LocationManagerService.java

…

MasterClearReceiver.java

…

MountListener.java

…

MountService.java

…

NetStatService.java

…

NotificationManagerService.java

…

PackageManagerBackupAgent.java

…

PackageManagerService.java

…

PowerManagerService.java

resolved conflicts for merge of efd91d7c to eclair-mr2-plus-aosp

2009-11-18 20:13:09 -05:00

ProcessMap.java

…

ProcessStats.java

…

RandomBlock.java

…

SensorService.java

…

ShutdownActivity.java

…

SystemBackupAgent.java

…

SystemServer.java

…

TelephonyRegistry.java

…

ViewServer.java

…

WallpaperManagerService.java

…

Watchdog.java

…

WifiService.java

…

WifiWatchdogService.java

…

WindowManagerService.java

am 1d62ea9d: Fix issue #2249821: Unable to start passion in safe mode

2009-11-18 11:51:05 -08:00