Kenny Root e6cd0c747e resolved conflicts for merge of 2433c443 to honeycomb-plus-aosp ...

Change-Id: I3385f57e5761679e6700bcbe3c41deb3ecd43ba1

2011-05-19 12:48:14 -07:00

..

am

am 2a20583a: am 700ab1c7: Merge "DO NOT MERGE. Integrate from master: Improve activity manager debug dumps." into honeycomb-mr2

2011-05-16 11:09:31 -07:00

connectivity

Linkproperties update via unsol data call state change.

2011-05-17 20:53:40 -07:00

location

resolved conflicts for merge of 18cc814c to honeycomb-plus-aosp

2011-05-10 15:52:15 -07:00

usb

DO NOT MERGE: UsbService: Make USB disconnect handling for accessory mode more robust

2011-03-29 23:05:59 -07:00

wm

Fix fake display size when rotated.

2011-05-18 15:07:48 -07:00

AccessibilityManagerService.java

…

AlarmManagerService.java

…

AppWidgetService.java

Catching all Exceptions when calling through to RemoteViewsFactory

2011-03-16 16:33:53 -07:00

AttributeCache.java

…

BackupManagerService.java

Don't spuriously time out restore sessions

2011-03-03 17:30:32 -08:00

BatteryService.java

…

BootReceiver.java

…

BrickReceiver.java

…

ClipboardService.java

…

ConnectivityService.java

am 59b1a4ed: Switch to use netd to add/remove routes.

2011-05-18 16:33:16 -07:00

CountryDetectorService.java

…

DevicePolicyManagerService.java

…

DeviceStorageMonitorService.java

…

DiskStatsService.java

…

DockObserver.java

…

DropBoxManagerService.java

…

EntropyService.java

…

EventLogTags.logtags

…

INativeDaemonConnectorCallbacks.java

…

InputMethodManagerService.java

Remove a workaround for the data inconsistency of SystemProperties

2011-03-14 12:38:34 -07:00

Installer.java

…

IntentResolver.java

…

LightsService.java

…

LoadAverageService.java

…

LocationManagerService.java

…

MasterClearReceiver.java

…

MountService.java

am 5a79cfd7: am 27ac64ec: Merge "StorageVolume: Add getStorageId() accessor" into honeycomb-mr2

2011-05-17 16:49:40 -07:00

NativeDaemonConnector.java

…

NativeDaemonConnectorException.java

…

NetStatService.java

…

NetworkManagementService.java

Switch to use netd to add/remove routes.

2011-05-18 15:25:43 -07:00

NetworkTimeUpdateService.java

…

NotificationManagerService.java

am 40bbf929: DO NOT MERGE: Backport USB accessory support to gingerbread

2011-03-02 15:16:32 -08:00

NotificationPlayer.java

…

PackageManagerBackupAgent.java

…

PackageManagerService.java

resolved conflicts for merge of 2433c443 to honeycomb-plus-aosp

2011-05-19 12:48:14 -07:00

PowerManagerService.java

…

PreferredComponent.java

Refector preferred activity code out of package manager.

2011-03-04 00:08:04 -08:00

ProcessMap.java

…

ProcessStats.java

…

RandomBlock.java

…

RecognitionManagerService.java

…

SamplingProfilerService.java

…

ShutdownActivity.java

…

StatusBarManagerService.java

…

SystemBackupAgent.java

…

SystemServer.java

…

TelephonyRegistry.java

TelephonyRegistry remove 4 uses of FLAG_RECEIVER_REPLACE_PENDING.

2011-05-14 06:51:21 -07:00

ThrottleService.java

…

TwilightCalculator.java

…

UiModeManagerService.java

…

VibratorService.java

am 7a84a60d: am 1a5a2379: Merge "Unregister callback from binder when vibration is removed"

2011-03-30 08:20:51 -07:00

WallpaperManagerService.java

DO NOT MERGE. Integrate from master: Rework display size access.

2011-05-16 11:58:27 -07:00

Watchdog.java

…

WifiService.java

Move Wifi Ap configuration to flat file

2011-05-09 22:46:55 -07:00

WifiStateTracker.java

…

WifiWatchdogService.java

…

WiredAccessoryObserver.java

…