diff options
| author | Fred Quintana <fredq@google.com> | 2009-12-15 15:57:33 -0800 |
|---|---|---|
| committer | Fred Quintana <fredq@google.com> | 2009-12-15 15:57:33 -0800 |
| commit | 2c5634198a4438e0d6be3e8cc3ae5fc6b0fdf588 (patch) | |
| tree | 06ec42e1a77f438bad81867cf22200d59d582471 /preloaded-classes | |
| parent | c333133107fb492de481a96ed1277e71daf2dd8c (diff) | |
| parent | 5a374f94f8be9604e0485e07943637783522c0b7 (diff) | |
| download | frameworks_base-2c5634198a4438e0d6be3e8cc3ae5fc6b0fdf588.zip frameworks_base-2c5634198a4438e0d6be3e8cc3ae5fc6b0fdf588.tar.gz frameworks_base-2c5634198a4438e0d6be3e8cc3ae5fc6b0fdf588.tar.bz2 | |
resolved conflicts for merge of 5a374f94 to master
Diffstat (limited to 'preloaded-classes')
| -rw-r--r-- | preloaded-classes | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/preloaded-classes b/preloaded-classes index ff66183..1b9a310 100644 --- a/preloaded-classes +++ b/preloaded-classes @@ -61,9 +61,6 @@ android.app.SearchDialog$SearchAutoComplete android.app.Service android.app.ServiceConnectionLeaked android.app.TabActivity -android.content.AbstractSyncableContentProvider -android.content.AbstractTableMerger -android.content.AsyncQueryHandler$WorkerHandler android.content.BroadcastReceiver android.content.ComponentCallbacks android.content.ComponentName @@ -87,13 +84,8 @@ android.content.Intent android.content.Intent$1 android.content.IntentFilter android.content.SearchRecentSuggestionsProvider -android.content.ServiceConnection -android.content.SharedPreferences android.content.SyncResult -android.content.SyncResult$1 android.content.SyncStats -android.content.SyncStats$1 -android.content.SyncableContentProvider android.content.UriMatcher android.content.pm.ActivityInfo android.content.pm.ActivityInfo$1 |