am a3e3c4dd: am 17f9fe13: Merge "Fix 5705837: Dismiss keyguard when launching...
am a3e3c4dd: am 17f9fe13: Merge "Fix 5705837: Dismiss keyguard when launching Settings from Statusbar" into ics-mr1
* commit 'a3e3c4dd':
Fix 5705837: Dismiss keyguard when launching Settings from Statusbar