tree 95fe37668526039917ce323d7f2db534c3975337
parent b4f245f7519f2f8b8dd7fa0b3897220eda17a7ef
parent 35818570032ff0e098b5fc1756185af50cd8a01c
author Brian Carlstrom <bdc@google.com> 1345756294 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1345756294 -0700

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

* commit '35818570032ff0e098b5fc1756185af50cd8a01c':
  Fix OpenSSL build for the Windows SDK