tree 95fe37668526039917ce323d7f2db534c3975337
parent d7c737f866ad84b4ec87e82bf5bfa9ce7d8eb2fd
parent 68bc28decce8f49fabe73b1008213407105deb6f
author Brian Carlstrom <bdc@google.com> 1345756724 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1345756724 -0700

am 68bc28de: am 35818570: am 1607b532: Merge "Fix OpenSSL build for the Windows SDK"

* commit '68bc28decce8f49fabe73b1008213407105deb6f':
  Fix OpenSSL build for the Windows SDK