Dianne Hackborn 3fe9cc5ea6 resolved conflicts for merge of e95c07bd to master ...

Change-Id: I9af0c08a9f1c1f68661efe051a66835e850b76f6

2011-06-14 16:13:26 -07:00

..

accessibility

Final polish of the interrogation feature.

2011-06-10 21:10:46 -07:00

am

am 816e5b72: am ee3de4a9: am a3ce0f1e: Merge "Remove compat mode dialog." into honeycomb-mr2

2011-06-09 11:24:32 -07:00

connectivity

VPN: add MTU support.

2011-06-13 15:05:37 -07:00

location

am 859443f2: am c0d9834a: am 5d78e0b8: Merge "GPS: Change NTP polling interval from 4 to 24 hours" into honeycomb-mr2

2011-05-24 12:57:17 -07:00

net

Generate default policy for devices without IMSI.

2011-06-13 22:28:34 -07:00

pm

resolved conflicts for merge of b2d0ee16 to master

2011-05-19 15:02:18 -07:00

usb

Move adb related functionality from SystemServer and NotificationManagerService to UsbDeviceManager

2011-06-13 22:20:06 -04:00

wm

Merge "Optimize orientation changes."

2011-06-10 18:59:21 -07:00

AlarmManagerService.java

…

AppWidgetService.java

am 7322e557: am a4cfcf10: am 75d6b3c2: Merge "Fix issue #4502672: Wrong xml resources used for homescreen widgets." into honeycomb-mr2

2011-06-03 13:17:00 -07:00

AttributeCache.java

…

BackupManagerService.java

Fix handling of directory entries

2011-06-08 20:11:49 -07:00

BatteryService.java

…

BootReceiver.java

…

BrickReceiver.java

…

ClipboardService.java

…

ConnectivityService.java

The service part of the user space VPN support.

2011-06-08 14:16:42 -07:00

CountryDetectorService.java

…

DevicePolicyManagerService.java

New device policy to disable camera.

2011-06-10 09:37:17 -07:00

DeviceStorageMonitorService.java

…

DiskStatsService.java

…

DockObserver.java

…

DropBoxManagerService.java

…

EntropyService.java

…

EventLogTags.logtags

…

INativeDaemonConnectorCallbacks.java

…

InputMethodManagerService.java

API to set additional subtypes

2011-06-10 15:26:03 +09:00

IntentResolver.java

…

LightsService.java

…

LoadAverageService.java

…

LocationManagerService.java

…

MasterClearReceiver.java

…

MountService.java

StorageVolume: Add allowMassStorage flag

2011-06-07 12:43:49 -07:00

NativeDaemonConnector.java

…

NativeDaemonConnectorException.java

…

NetworkManagementService.java

Growable NetworkStats object instead of builder.

2011-06-11 22:17:17 -07:00

NetworkTimeUpdateService.java

…

NotificationManagerService.java

Move adb related functionality from SystemServer and NotificationManagerService to UsbDeviceManager

2011-06-13 22:20:06 -04:00

NotificationPlayer.java

…

PackageManagerBackupAgent.java

…

PowerManagerService.java

…

PreferredComponent.java

…

ProcessMap.java

…

ProcessStats.java

…

RandomBlock.java

…

RecognitionManagerService.java

…

SamplingProfilerService.java

…

ShutdownActivity.java

…

StatusBarManagerService.java

resolved conflicts for merge of e95c07bd to master

2011-06-14 16:13:26 -07:00

SystemBackupAgent.java

Implement shared-storage full backup/restore

2011-06-07 12:16:27 -07:00

SystemServer.java

Move adb related functionality from SystemServer and NotificationManagerService to UsbDeviceManager

2011-06-13 22:20:06 -04:00

TelephonyRegistry.java

am d0903e14: am 6e41b32d: Merge "TelephonyRegistry remove 4 uses of FLAG_RECEIVER_REPLACE_PENDING." into honeycomb-LTE

2011-05-14 07:50:40 -07:00

ThrottleService.java

Return NetworkStats bundle from NM service.

2011-05-04 16:07:21 -07:00

TwilightCalculator.java

…

UiModeManagerService.java

…

VibratorService.java

…

WallpaperManagerService.java

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

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

Watchdog.java

…

WifiService.java

resolved conflicts for merge of e2aa0490 to master

2011-06-09 17:50:36 -07:00

WifiWatchdogService.java

WifiWatchdogService refactor

2011-06-09 13:55:15 -07:00

WiredAccessoryObserver.java

…