Doug Zongker 0f91f87002 am f6683bb5: Merge change I5f1d2d24 into eclair-mr2 ...

Merge commit 'f6683bb5592825a62e30760abb0734deaaf7bd93' into eclair-mr2-plus-aosp

* commit 'f6683bb5592825a62e30760abb0734deaaf7bd93':
  move event log tags used by ActivityManager into this package

2009-12-04 16:50:50 -08:00

..

ActivityManagerService.java

am f6683bb5: Merge change I5f1d2d24 into eclair-mr2

2009-12-04 16:50:50 -08:00

ActivityResult.java

…

AppBindRecord.java

donut snapshot

2009-05-20 11:28:04 -07:00

AppErrorDialog.java

donut snapshot

2009-07-21 11:16:54 -07:00

AppErrorResult.java

…

AppNotRespondingDialog.java

donut snapshot

2009-07-21 11:16:54 -07:00

AppWaitingForDebuggerDialog.java

…

BackupRecord.java

donut snapshot

2009-07-21 11:16:54 -07:00

BaseErrorDialog.java

…

BatteryStatsService.java

Fix for 2221718: Hang in BatteryStatsService.noteBluetoothOn

2009-11-05 11:41:58 -08:00

BroadcastFilter.java

Debugging for issue #2250075: Desk dock clock app sometimes doesn't

2009-11-11 17:51:41 -08:00

BroadcastRecord.java

Debugging for issue #2250075: Desk dock clock app sometimes doesn't

2009-11-11 17:51:41 -08:00

ConnectionRecord.java

Add better service reporting.

2009-09-03 14:11:02 -07:00

ContentProviderRecord.java

donut snapshot

2009-05-20 11:28:04 -07:00

DeviceMonitor.java

…

EventLogTags.logtags

move event log tags used by ActivityManager into this package

2009-12-04 16:36:17 -08:00

FactoryErrorDialog.java

…

HistoryRecord.java

move event log tags used by ActivityManager into this package

2009-12-04 16:36:17 -08:00

IntentBindRecord.java

donut snapshot

2009-05-20 11:28:04 -07:00

package.html

…

PendingIntentRecord.java

Fix issue #2166755: BroadcastReceiver trying to return result during a non-ordered broadcast

2009-10-05 15:52:32 -07:00

PendingThumbnailsRecord.java

…

ProcessRecord.java

Fix issue #2163654: deadlock, runtime restart

2009-10-07 11:10:33 -07:00

ReceiverList.java

donut snapshot

2009-07-21 11:16:54 -07:00

ServiceRecord.java

resolved conflicts for merge of 301b97ac to eclair

2009-08-27 12:26:44 -07:00

TaskRecord.java

donut snapshot

2009-05-20 11:28:04 -07:00

UriPermission.java

donut snapshot

2009-05-20 11:28:04 -07:00

UsageStatsService.java

If the usage stats file doesn't exist in the first place there is no need to

2009-12-04 13:59:38 -08:00