OSDN Git Service

am 7cd016e3: am 7dfc3540: am 0f01eb7f: am ae9d437b: Merge "Settings: Ensure CryptKeep...
authorJohn Spurlock <jspurlock@google.com>
Wed, 17 Sep 2014 20:10:04 +0000 (20:10 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 17 Sep 2014 20:10:04 +0000 (20:10 +0000)
commitf1f11b5b25ceed85f74c6d64e91a870bf7a1592c
treefc313d4fe92311632a7a5cad9b2e36aaedde92cc
parentf03f6ab3762611ee22b1dbb3dc6bb81379d8ac7e
parent7cd016e3e0a6256b38f3f64423c0d90e63a873bc
am 7cd016e3: am 7dfc3540: am 0f01eb7f: am ae9d437b: Merge "Settings: Ensure CryptKeeper dismisses secure keyguards." into lmp-dev

* commit '7cd016e3e0a6256b38f3f64423c0d90e63a873bc':
  Settings: Ensure CryptKeeper dismisses secure keyguards.