diff options
| author | Tom Taylor <tomtaylor@google.com> | 2009-12-22 10:11:55 -0800 |
|---|---|---|
| committer | Tom Taylor <tomtaylor@google.com> | 2009-12-22 10:11:55 -0800 |
| commit | f0108cda21bec61418b24aa6217406072780b5d5 (patch) | |
| tree | 8866dfdec50a4bff63f188784779f7e1a9aa0216 /preloaded-classes | |
| parent | fddd8f96f34b622cbdd0d891f8a7f5b7e18fdbf8 (diff) | |
| parent | ad2fa35d888e0763bfef0fc060775bec5d169479 (diff) | |
| download | frameworks_base-f0108cda21bec61418b24aa6217406072780b5d5.zip frameworks_base-f0108cda21bec61418b24aa6217406072780b5d5.tar.gz frameworks_base-f0108cda21bec61418b24aa6217406072780b5d5.tar.bz2 | |
resolved conflicts for merge of ad2fa35d to master
Change-Id: Ia4362cd48ac0689b91003943a4cd9660da72ff90
Diffstat (limited to 'preloaded-classes')
| -rw-r--r-- | preloaded-classes | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/preloaded-classes b/preloaded-classes index 72ad8ef..f695f4e 100644 --- a/preloaded-classes +++ b/preloaded-classes @@ -209,7 +209,6 @@ android.net.LocalSocketAddress$Namespace android.net.LocalSocketImpl android.net.LocalSocketImpl$SocketInputStream android.net.LocalSocketImpl$SocketOutputStream -android.net.NetworkConnectivityListener$State android.net.NetworkInfo android.net.NetworkInfo$DetailedState android.net.SSLCertificateSocketFactory @@ -576,7 +575,11 @@ android.widget.ViewAnimator android.widget.ViewSwitcher android.widget.ZoomButton android.widget.ZoomControls -com.android.internal.database.ArrayListCursor +com.android.common.ArrayListCursor +com.android.common.FastXmlSerializer +com.android.common.NetworkConnectivityListener +com.android.common.NetworkConnectivityListener$State +com.android.common.XmlUtils com.android.internal.database.SortCursor com.android.internal.appwidget.IAppWidgetService$Stub com.android.internal.http.multipart.FilePart @@ -633,7 +636,6 @@ com.android.internal.telephony.ServiceStateTracker com.android.internal.telephony.gsm.stk.ComprehensionTlvTag com.android.internal.telephony.gsm.stk.ResultCode -com.android.internal.util.FastXmlSerializer com.android.internal.view.IInputConnectionWrapper com.android.internal.view.IInputConnectionWrapper$MyHandler com.android.internal.view.IInputConnectionWrapper$SomeArgs |