| commit | c1ceb6c614d6489b5152588d1bb41689552d9b8e | [log] [tgz] |
|---|---|---|
| author | Jeff Brown <jeffbrown@google.com> | Wed May 16 16:27:06 2012 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed May 16 16:27:06 2012 -0700 |
| tree | 6a9fec5ea6833dacb2c647225fb680bab7afc2b0 | |
| parent | 00c53eb6ad6ec74dac2aa235b1f61d949ddca875 [diff] | |
| parent | 00ee17718af8a229d0e6a14cd1f47b56a8b14b0f [diff] |
am 00ee1771: Merge "Don\'t allow shortcuts while keyguard showing." into jb-dev * commit '00ee17718af8a229d0e6a14cd1f47b56a8b14b0f': Don't allow shortcuts while keyguard showing.