OSDN Git Service

(root) / android-x86 / frameworks-base.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: bb9114f 3b9fbd2)
am 3b9fbd2f: Merge "Fixed a bug with encryption where the keyguard was never shown...
authorSelim Cinek <cinek@google.com>
Wed, 24 Jun 2015 22:25:25 +0000 (22:25 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 24 Jun 2015 22:25:25 +0000 (22:25 +0000)
commit60b716ef006091d335eda01c73cfe322b6208901
treea422bb484af304f66cecebe2384754931b7f7567tree | snapshot
parentbb9114ff6dcef85f118afa350c33c2c35a68f41dcommit | diff
parent3b9fbd2f2de75e53a836d3cb73bcfc25fdb3a67acommit | diff
am 3b9fbd2f: Merge "Fixed a bug with encryption where the keyguard was never shown with PIN" into mnc-dev

* commit '3b9fbd2f2de75e53a836d3cb73bcfc25fdb3a67a':
  Fixed a bug with encryption where the keyguard was never shown with PIN
frameworks/base
About OSDN
Find Software
Develop Software
Help