Jean-Baptiste Queru 66a5d695ed resolved conflicts for merge of b4ae2f1b to gingerbread-plus-aosp ...

Change-Id: I9d4e2649375d9262efe8aaade0778f638d04afa8

2010-10-25 17:27:16 -07:00

..

ActivityManagerService.java

am 38993d8d: Merge "Fix issue #3122240: Expose xlarge in GB." into gingerbread

2010-10-22 14:03:08 -07:00

ActivityRecord.java

Fix issue #3001368: API REVIEW: android.app.Activity

2010-10-05 18:07:54 -07:00

ActivityResult.java

…

ActivityStack.java

resolved conflicts for merge of b4ae2f1b to gingerbread-plus-aosp

2010-10-25 17:27:16 -07:00

AppBindRecord.java

…

AppErrorDialog.java

…

AppErrorResult.java

…

AppNotRespondingDialog.java

…

AppWaitingForDebuggerDialog.java

…

BackupRecord.java

…

BaseErrorDialog.java

…

BatteryStatsService.java

…

BroadcastFilter.java

…

BroadcastRecord.java

Work on issue #3062691: GPS enable bypass via com.android.settings.widget.SettingsAppWidgetProvider

2010-10-06 14:27:34 -07:00

ConnectionRecord.java

…

ContentProviderRecord.java

…

DeviceMonitor.java

…

EventLogTags.logtags

…

FactoryErrorDialog.java

…

IntentBindRecord.java

…

LaunchWarningWindow.java

…

package.html

…

PendingIntentRecord.java

…

PendingThumbnailsRecord.java

…

ProcessRecord.java

Fix issue #3001368: API REVIEW: android.app.Activity

2010-10-05 18:07:54 -07:00

ReceiverList.java

…

ServiceRecord.java

…

StrictModeViolationDialog.java

…

TaskRecord.java

…

UriPermission.java

Allow all apps to call ContentResolver.getType().

2010-09-26 21:31:47 -07:00

UriPermissionOwner.java

…

UsageStatsService.java

Work on issue #3101415: Crespo apps seem to have their UID changed over time.

2010-10-15 14:46:33 -07:00