Commits
Selim Cinek authored and Android Git Automerger committed 2a0295144adM
am 60b716ef: am 3b9fbd2f: Merge "Fixed a bug with encryption where the keyguard was never shown with PIN" into mnc-dev * commit '60b716ef006091d335eda01c73cfe322b6208901': Fixed a bug with encryption where the keyguard was never shown with PIN
Showing diff to4d97dbba00d