tree d2ccd010fbd4026b08c04bfbc28f4c33fe0b23ab
parent 5c6017a385c66cfbdea972ec3b996498a13eecad
parent 0a773d3b9e6c2f9f52bc439516207856892d5a16
author Brian Carlstrom <bdc@google.com> 1363537860 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1363537860 -0700

am 0a773d3b: am 17f43736: Merge "Fix for test_SSLSocket_HandshakeCompletedListener_RuntimeException"

* commit '0a773d3b9e6c2f9f52bc439516207856892d5a16':
  Fix for test_SSLSocket_HandshakeCompletedListener_RuntimeException