summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBrian Carlstrom <bdc@google.com>2010-05-07 10:25:41 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2010-05-07 10:25:41 -0700
commita0a126a060b6b9ba51bc99f82ff4d322f779325e (patch)
tree2187fd23bd5fa69fcc8f9176e9f90851fe4456be
parent4405a0fefb63ebe4fe54ce54a64d3f37848c1285 (diff)
parente34d31e690cdfc529fe8e1e8f70e50c3719a4ccc (diff)
downloadframeworks_base-a0a126a060b6b9ba51bc99f82ff4d322f779325e.zip
frameworks_base-a0a126a060b6b9ba51bc99f82ff4d322f779325e.tar.gz
frameworks_base-a0a126a060b6b9ba51bc99f82ff4d322f779325e.tar.bz2
am e34d31e6: am e616553e: Updaing preloaded classes with removal of OpenSSLSocketImpl
Merge commit 'e34d31e690cdfc529fe8e1e8f70e50c3719a4ccc' into kraken * commit 'e34d31e690cdfc529fe8e1e8f70e50c3719a4ccc': Updaing preloaded classes with removal of OpenSSLSocketImpl$Finalizer
-rw-r--r--preloaded-classes1
1 files changed, 0 insertions, 1 deletions
diff --git a/preloaded-classes b/preloaded-classes
index 3a27bac..f300fe7 100644
--- a/preloaded-classes
+++ b/preloaded-classes
@@ -1184,7 +1184,6 @@ org.apache.harmony.xnet.provider.jsse.NativeCrypto
org.apache.harmony.xnet.provider.jsse.OpenSSLServerSocketImpl
org.apache.harmony.xnet.provider.jsse.OpenSSLSessionImpl
org.apache.harmony.xnet.provider.jsse.OpenSSLSocketImpl
-org.apache.harmony.xnet.provider.jsse.OpenSSLSocketImpl$Finalizer
org.apache.harmony.xnet.provider.jsse.OpenSSLSocketImpl$LoggerHolder
org.apache.harmony.xnet.provider.jsse.ProtocolVersion
org.apache.harmony.xnet.provider.jsse.SSLContextImpl