am 17f9fe13: Merge "Fix 5705837: Dismiss keyguard when launching Settings from Statusbar" into ics-mr1
* commit '17f9fe13c7c78eaab521f6f85b48b0e8f5adddbc': Fix 5705837: Dismiss keyguard when launching Settings from Statusbar
This commit is contained in:
commit
74015225ec