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:
Jim Miller 2011-12-05 22:14:37 -08:00 committed by Android Git Automerger
commit 74015225ec

Diff Content Not Available