tree 2187fd23bd5fa69fcc8f9176e9f90851fe4456be
parent 4405a0fefb63ebe4fe54ce54a64d3f37848c1285
parent e34d31e690cdfc529fe8e1e8f70e50c3719a4ccc
author Brian Carlstrom <bdc@google.com> 1273253141 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1273253141 -0700

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