| commit | 63b244433f7b1941685ba6b93b0e4e968de65bcc | [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 | 21db6ba3941cb152be855f316bea00fc0f248da1 | |
| parent | 419204c8fb77ead7bac1523487bc40202f460215 [diff] | |
| parent | a3e3c4dd37139615adb88a38e6a99402e0cfcd2b [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