OSDN Git Service

am ab4fe2d9: am 9e51261d: am ae9d437b: Merge "Settings: Ensure CryptKeeper dismisses...
authorJohn Spurlock <jspurlock@google.com>
Wed, 17 Sep 2014 19:59:34 +0000 (19:59 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 17 Sep 2014 19:59:34 +0000 (19:59 +0000)
commit4f6d2520509aafcc0c9edfd8e3f57d6a9f2549ae
tree89218cf0948ff2ec490c2aaa7c1f5e9161b8eecc
parent13a63ef39bb93bcd6adfc7a7dc0b46da99115bf0
parentab4fe2d94fc1a0f142a390ef25ca64bc83fa17a0
am ab4fe2d9: am 9e51261d: am ae9d437b: Merge "Settings: Ensure CryptKeeper dismisses secure keyguards." into lmp-dev

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