Commits
Jorim Jaggi authored and The Android Automerger committed 0642d143e30
:Show enter PIN/PUK before notifications on Keyguard. Change-Id: Icec12a43487fe76378e10bb8aaaa163c53b69075 Conflicts: packages/SystemUI/src/com/android/systemui/statusbar/phone/KeyguardBouncer.java