Merge commit '126ac7f9f957c6be35d6d43f8dee1d5ee7139f95' into eclair-mr2-plus-aosp * commit '126ac7f9f957c6be35d6d43f8dee1d5ee7139f95': Fix issue #2186709: Can't unlock the device for a while
Merge commit '126ac7f9f957c6be35d6d43f8dee1d5ee7139f95' into eclair-mr2-plus-aosp * commit '126ac7f9f957c6be35d6d43f8dee1d5ee7139f95': Fix issue #2186709: Can't unlock the device for a while