am b10e2f1a: Merge change Iac534225 into eclair
am b10e2f1a: Merge change Iac534225 into eclair

Merge commit 'b10e2f1a861933f50d9ad8ea24b5dfa5643a2c11' into eclair-plus-aosp

* commit 'b10e2f1a861933f50d9ad8ea24b5dfa5643a2c11':
  Fix issue #2186709: Can't unlock the device for a while

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