Merge commit '720094bfaac28bb65cf9d5a0313f298dd8178f7f' into eclair-mr2-plus-aosp * commit '720094bfaac28bb65cf9d5a0313f298dd8178f7f': Another fix for #2186897: Cannot unlock the device by swiping
Merge commit '720094bfaac28bb65cf9d5a0313f298dd8178f7f' into eclair-mr2-plus-aosp * commit '720094bfaac28bb65cf9d5a0313f298dd8178f7f': Another fix for #2186897: Cannot unlock the device by swiping