Dianne Hackborn dc71b9e4d6 resolved conflicts for merge of 6a3eddb4 to master ...

Change-Id: I1ca1d100274d4a733ef2bf58b0d5d7217b4f858e

2010-09-30 20:34:34 -07:00

..

ActivityManagerService.java

resolved conflicts for merge of 6a3eddb4 to master

2010-09-30 20:34:34 -07:00

ActivityRecord.java

resolved conflicts for merge of 6a3eddb4 to master

2010-09-30 20:34:34 -07:00

ActivityResult.java

…

ActivityStack.java

Rub in a little 'ol log-b-gone.

2010-09-30 18:27:22 -07:00

AppBindRecord.java

…

AppErrorDialog.java

…

AppErrorResult.java

…

AppNotRespondingDialog.java

…

AppWaitingForDebuggerDialog.java

…

BackupRecord.java

…

BaseErrorDialog.java

…

BatteryStatsService.java

Update code for new BT APIs.

2010-09-28 20:02:12 -07:00

BroadcastFilter.java

…

BroadcastRecord.java

…

ConnectionRecord.java

…

ContentProviderRecord.java

…

DeviceMonitor.java

…

EventLogTags.logtags

…

FactoryErrorDialog.java

…

IntentBindRecord.java

…

LaunchWarningWindow.java

…

package.html

…

PendingIntentRecord.java

…

PendingThumbnailsRecord.java

…

ProcessRecord.java

…

ReceiverList.java

…

ServiceRecord.java

…

StrictModeViolationDialog.java

…

TaskRecord.java

…

UriPermission.java

Allow all apps to call ContentResolver.getType().

2010-09-27 18:05:44 -07:00

UriPermissionOwner.java

…

UsageStatsService.java

Rub in a little 'ol log-b-gone.

2010-09-30 18:27:22 -07:00