tree 926cfbfad47d16d19ac4eb42e6f6eb7aa845c621
parent 4ffcb763447e43d6e8c8f7fa2ed3db474b8b0e5d
parent d1850e739b0e6d5f788349db0bddb8277757f800
author Dan Egnor <egnor@google.com> 1256847333 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1256847333 -0700

am d1850e73: Fix incremental build break in openssl.

Merge commit 'd1850e739b0e6d5f788349db0bddb8277757f800' into eclair-mr2-plus-aosp

* commit 'd1850e739b0e6d5f788349db0bddb8277757f800':
  Fix incremental build break in openssl.