tree 2f094b24c4614f58d72eae474440d1cc53d34daf
parent 3027855fb0d7cc32963aed892cac865c866fa87c
parent ec62719c8396997b436c44906c2760e3914698b8
author Ying Wang <wangying@google.com> 1287507136 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1287507136 -0700

am ec62719c: am 004f968d: Merge "Link against the static libcrypto in external/openssl." into gingerbread

Merge commit 'ec62719c8396997b436c44906c2760e3914698b8'

* commit 'ec62719c8396997b436c44906c2760e3914698b8':
  Link against the static libcrypto in external/openssl.