am 60b716ef: am 3b9fbd2f: Merge "Fixed a bug with encryption where the...
am 60b716ef: am 3b9fbd2f: Merge "Fixed a bug with encryption where the keyguard was never shown with PIN" into mnc-dev
* commit '60b716ef':
Fixed a bug with encryption where the keyguard was never shown with PIN