OSDN Git Service

am 0f01eb7f: am ae9d437b: Merge "Settings: Ensure CryptKeeper dismisses secure keygua...
authorJohn Spurlock <jspurlock@google.com>
Wed, 17 Sep 2014 19:53:47 +0000 (19:53 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 17 Sep 2014 19:53:47 +0000 (19:53 +0000)
commit7dfc3540a33c0bf53227db86ce193dc8ef0f02f4
treedc57bd231e94f0869dccaeeac7cc7b32862edb9b
parent01de98321a8485d3aa943976f8192caccba50887
parent0f01eb7f1ad7939753633becfafc67f2446c9318
am 0f01eb7f: am ae9d437b: Merge "Settings: Ensure CryptKeeper dismisses secure keyguards." into lmp-dev

* commit '0f01eb7f1ad7939753633becfafc67f2446c9318':
  Settings: Ensure CryptKeeper dismisses secure keyguards.