Dianne Hackborn aa9d84c37e resolved conflicts for merge of 05be6d6f to master ...

Change-Id: Ic6a6c5bb300f6f1d43f9ed550b284282b4f16212

2011-05-09 19:00:59 -07:00

..

ActivityManagerService.java

resolved conflicts for merge of 05be6d6f to master

2011-05-09 19:00:59 -07:00

ActivityRecord.java

resolved conflicts for merge of 05be6d6f to master

2011-05-09 19:00:59 -07:00

ActivityResult.java

…

ActivityStack.java

resolved conflicts for merge of 05be6d6f to master

2011-05-09 19:00:59 -07:00

AppBindRecord.java

…

AppErrorDialog.java

…

AppErrorResult.java

…

AppNotRespondingDialog.java

…

AppWaitingForDebuggerDialog.java

…

BackupRecord.java

…

BaseErrorDialog.java

Fix bug 3245465 - Themed dialog icons

2011-01-08 13:09:51 -08:00

BatteryStatsService.java

Rewrite battery history storage.

2011-04-14 10:57:22 -07:00

BroadcastFilter.java

…

BroadcastRecord.java

Clear reference to the IIntentReceiver in order to avoid memory leak

2011-01-05 18:59:07 -08:00

ConnectionRecord.java

…

ContentProviderRecord.java

Improve activity manager debug dumps.

2011-04-07 18:26:15 -07:00

CoreSettingsObserver.java

Propagating core settings to the system process.

2011-03-03 18:20:43 -08:00

DeviceMonitor.java

…

EventLogTags.logtags

…

FactoryErrorDialog.java

…

IntentBindRecord.java

…

LaunchWarningWindow.java

Fix missing AOSP copyright headers for more files

2011-03-17 14:43:12 -07:00

package.html

…

PendingIntentRecord.java

…

PendingThumbnailsRecord.java

…

ProcessRecord.java

resolved conflicts for merge of 05be6d6f to master

2011-05-09 19:00:59 -07:00

ReceiverList.java

…

ServiceRecord.java

Fix dumpsys output.

2011-05-06 08:36:20 -07:00

StrictModeViolationDialog.java

…

TaskAccessInfo.java

Forgot to add this file.

2011-04-12 19:12:30 -07:00

TaskRecord.java

Rework thumbnails in activity manager.

2011-04-08 18:16:21 -07:00

ThumbnailHolder.java

Rework thumbnails in activity manager.

2011-04-08 18:16:21 -07:00

TransferPipe.java

Improve activity manager debug dumps.

2011-04-07 18:26:15 -07:00

UriPermission.java

…

UriPermissionOwner.java

…

UsageStatsService.java

…