am f6d6d180: am 126ac7f9: am b10e2f1a: Merge change Iac534225 into eclair

Merge commit 'f6d6d180f8c2bec2b152e5dbf74a0c8aec3ec8ee'

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