OSDN Git Service

am 65699d14: am 499d6840: Merge "Remove obsolete keystore path"
authorKenny Root <kroot@google.com>
Wed, 26 Jun 2013 23:59:03 +0000 (16:59 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 26 Jun 2013 23:59:03 +0000 (16:59 -0700)
* commit '65699d14fab37ab374ce46c6192d4e9b56ec26c1':
  Remove obsolete keystore path

1  2 
src/crypto/tls_openssl.c

Simple merge