| commit | 2a0295144ada058f94a744dcafd62ab8afda83d3 | [log] [tgz] |
|---|---|---|
| author | Selim Cinek <cinek@google.com> | Wed Jun 24 22:39:21 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Jun 24 22:39:21 2015 +0000 |
| tree | da2dd2cf470edb3b41258880f15d4cf53915b8bf | |
| parent | 4d97dbba00d4f792c0236852d209071224e680ba [diff] | |
| parent | 60b716ef006091d335eda01c73cfe322b6208901 [diff] |
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