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

Browse Source

* commit 'a3e3c4dd37139615adb88a38e6a99402e0cfcd2b':
  Fix 5705837: Dismiss keyguard when launching Settings from Statusbar

...

This commit is contained in:

Jim Miller 2011-12-06 08:49:51 -08:00 committed by Android Git Automerger

parent 3a4756f60c 74015225ec

commit dfa7dc74d9

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Show Stats Download Patch File Download Diff File Expand all files Collapse all files

Diff Content Not Available