am 7dcf5c7b: Merge change 24426 into eclair
am 7dcf5c7b: Merge change 24426 into eclair

Merge commit '7dcf5c7ba82437fe197354f7d0585de20a382e4d' into eclair-plus-aosp

* commit '7dcf5c7ba82437fe197354f7d0585de20a382e4d':
  keystore: remove "#include <openssl/engine.h>".

xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base