| commit | dfa7dc74d96f5f8be024fa6ea56c4486c417603f | [log] [tgz] |
|---|---|---|
| author | Jim Miller <jaggies@google.com> | Tue Dec 06 08:49:51 2011 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Dec 06 08:49:51 2011 -0800 |
| tree | a4f7155e7d0e10895947a985fd9e447a72f9a5a0 | |
| parent | 3a4756f60c12714b693769c34f77951b6d0d274a [diff] | |
| parent | 74015225ec5bd0fb516f907712fe4e8730a57efd [diff] |
am a3e3c4dd: am 17f9fe13: Merge "Fix 5705837: Dismiss keyguard when launching Settings from Statusbar" into ics-mr1 * commit 'a3e3c4dd37139615adb88a38e6a99402e0cfcd2b': Fix 5705837: Dismiss keyguard when launching Settings from Statusbar