OSDN Git Service

am 9e51261d: am ae9d437b: Merge "Settings: Ensure CryptKeeper dismisses secure keygua...
authorJohn Spurlock <jspurlock@google.com>
Wed, 17 Sep 2014 19:53:54 +0000 (19:53 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 17 Sep 2014 19:53:54 +0000 (19:53 +0000)
commitab4fe2d94fc1a0f142a390ef25ca64bc83fa17a0
tree6b2ebde41f6dcc8e276f5a58e4360e43efa0c1f1
parent63f9500e0daae4b9aeda2bf4282bbe5dd8925b8e
parent9e51261dcc5db11be92660a3bde6b1f1e59ee128
am 9e51261d: am ae9d437b: Merge "Settings: Ensure CryptKeeper dismisses secure keyguards." into lmp-dev

* commit '9e51261dcc5db11be92660a3bde6b1f1e59ee128':
  Settings: Ensure CryptKeeper dismisses secure keyguards.