OSDN Git Service

am ae9d437b: Merge "Settings: Ensure CryptKeeper dismisses secure keyguards." into...
authorJohn Spurlock <jspurlock@google.com>
Wed, 17 Sep 2014 19:48:11 +0000 (19:48 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 17 Sep 2014 19:48:11 +0000 (19:48 +0000)
commit9e51261dcc5db11be92660a3bde6b1f1e59ee128
tree6b2ebde41f6dcc8e276f5a58e4360e43efa0c1f1
parent0818370405da62d427620da5407ca4c5f9c969a0
parentae9d437b4ab8dc98c347e4218390a38900979faa
am ae9d437b: Merge "Settings: Ensure CryptKeeper dismisses secure keyguards." into lmp-dev

* commit 'ae9d437b4ab8dc98c347e4218390a38900979faa':
  Settings: Ensure CryptKeeper dismisses secure keyguards.