Commits
Jorim Jaggi authored and The Android Automerger committed b9ad98c9a87
Make MENU key work again to dismiss insecure Keyguard. Bug: 14110426 Change-Id: Iab8ec9633a2169e6def13a0c6e09b77543adbb41 Conflicts: packages/SystemUI/src/com/android/systemui/statusbar/phone/KeyguardBouncer.java