Brad Fitzpatrick 28130baefb resolved conflicts for merge of 6b50986a to gingerbread-plus-aosp ...

Change-Id: I7c5ec7ae717e75ad242e2c1ad4537052e4eea718

2010-08-27 12:08:40 -07:00

..

admin

…

backup

…

Activity.java

SharedPreferences$Editor.startCommit()

2010-08-27 09:10:11 -07:00

ActivityGroup.java

…

ActivityManager.java

…

ActivityManagerNative.java

Don't retain global ref to last inflated context.

2010-08-25 21:50:54 -07:00

ActivityThread.java

SharedPreferences$Editor.startCommit()

2010-08-27 09:10:11 -07:00

AlarmManager.java

…

AlertDialog.java

…

AliasActivity.java

…

AppGlobals.java

…

Application.java

…

ApplicationErrorReport.java

…

ApplicationLoaders.java

…

ApplicationThreadNative.java

…

ContextImpl.java

resolved conflicts for merge of 6b50986a to gingerbread-plus-aosp

2010-08-27 12:08:40 -07:00

DatePickerDialog.java

am 70c9ffbc: am 11a72482: Merge "docs: add links from widget classes to tutorials" into froyo

2010-08-19 17:40:10 -07:00

Dialog.java

…

ExpandableListActivity.java

…

FullBackupAgent.java

…

IActivityController.aidl

…

IActivityManager.java

Don't retain global ref to last inflated context.

2010-08-25 21:50:54 -07:00

IActivityPendingResult.aidl

…

IActivityWatcher.aidl

…

IAlarmManager.aidl

…

IApplicationThread.java

…

IBackupAgent.aidl

…

IInstrumentationWatcher.aidl

…

INotificationManager.aidl

…

Instrumentation.java

…

IntentService.java

…

ISearchManager.aidl

…

ISearchManagerCallback.aidl

…

IServiceConnection.aidl

…

IThumbnailReceiver.aidl

…

ITransientNotification.aidl

…

IUiModeManager.aidl

…

IWallpaperManager.aidl

…

IWallpaperManagerCallback.aidl

…

KeyguardManager.java

…

LauncherActivity.java

…

ListActivity.java

…

LoadedApk.java

…

LocalActivityManager.java

…

NativeActivity.java

…

Notification.aidl

…

Notification.java

…

NotificationManager.java

…

package.html

…

PendingIntent.aidl

…

PendingIntent.java

…

ProgressDialog.java

…

QueuedWork.java

SharedPreferences$Editor.startCommit()

2010-08-27 09:10:11 -07:00

ResultInfo.java

…

SearchableInfo.aidl

…

SearchableInfo.java

…

SearchDialog.java

…

SearchManager.java

…

Service.java

…

StatusBarManager.java

…

SuggestionsAdapter.java

…

TabActivity.java

…

TimePickerDialog.java

am 70c9ffbc: am 11a72482: Merge "docs: add links from widget classes to tutorials" into froyo

2010-08-19 17:40:10 -07:00

UiModeManager.java

…

WallpaperInfo.aidl

…

WallpaperInfo.java

…

WallpaperManager.java

…