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

Merge commit '1b2ba40ee990d53ee0157bc745e4762102b0c9af'

* commit '1b2ba40ee990d53ee0157bc745e4762102b0c9af':
  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