Dianne Hackborn 5c83a5f2cc resolved conflicts for merge of 2ecce34f to master ...

Change-Id: Ic4e38199beaf8c16f9d28ac5296e8aaa61788b36

2010-03-12 16:46:46 -08:00

..

ActivityManagerService.java

resolved conflicts for merge of 2ecce34f to master

2010-03-12 16:46:46 -08:00

ActivityResult.java

auto import from //depot/cupcake/@135843

2009-03-03 19:31:44 -08:00

AppBindRecord.java

donut snapshot

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

AppErrorDialog.java

Switch the services library to using the new Slog

2010-03-01 13:06:50 -08:00

AppErrorResult.java

auto import from //depot/cupcake/@135843

2009-03-03 19:31:44 -08:00

AppNotRespondingDialog.java

Switch the services library to using the new Slog

2010-03-01 13:06:50 -08:00

AppWaitingForDebuggerDialog.java

Simplify & update ANR logging; report ANR data into the dropbox.

2010-01-11 14:51:22 -08:00

BackupRecord.java

Switch the services library to using the new Slog

2010-03-01 13:06:50 -08:00

BaseErrorDialog.java

Switch the services library to using the new Slog

2010-03-01 13:06:50 -08:00

BatteryStatsService.java

Switch the services library to using the new Slog

2010-03-01 13:06:50 -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

Switch the services library to using the new Slog

2010-03-01 13:06:50 -08:00

EventLogTags.logtags

As requested, expand ANR event log entry (and crash/WTF too) to include

2010-01-22 14:47:35 -08:00

FactoryErrorDialog.java

auto import from //depot/cupcake/@135843

2009-03-03 19:31:44 -08:00

HistoryRecord.java

Add new -W option to Am to wait for the start to complete.

2010-02-26 16:34:33 -08:00

IntentBindRecord.java

donut snapshot

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

package.html

auto import from //depot/cupcake/@135843

2009-03-03 19:31:44 -08:00

PendingIntentRecord.java

Switch the services library to using the new Slog

2010-03-01 13:06:50 -08:00

PendingThumbnailsRecord.java

auto import from //depot/cupcake/@135843

2009-03-03 19:31:44 -08:00

ProcessRecord.java

Rework the LRU list for hidden and empty processes.

2009-12-17 16:03:49 -08:00

ReceiverList.java

donut snapshot

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

ServiceRecord.java

Switch the services library to using the new Slog

2010-03-01 13:06:50 -08: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

Switch the services library to using the new Slog

2010-03-01 13:06:50 -08:00