OSDN Git Service

am ab4fe2d9: am 9e51261d: am ae9d437b: Merge "Settings: Ensure CryptKeeper dismisses...
authorJohn Spurlock <jspurlock@google.com>
Mon, 27 Oct 2014 18:52:06 +0000 (18:52 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Mon, 27 Oct 2014 18:52:06 +0000 (18:52 +0000)
commit96cd925174f6c678b4242ccd4d8b5ccee94a81fc
treec6ef5d273c98188de9e990c14b470c0e0f02f70c
parent4a62d8e69f095b301ff323fba7bd87111cfb6c73
parentab4fe2d94fc1a0f142a390ef25ca64bc83fa17a0
am ab4fe2d9: am 9e51261d: am ae9d437b: Merge "Settings: Ensure CryptKeeper dismisses secure keyguards." into lmp-dev

* commit 'ab4fe2d94fc1a0f142a390ef25ca64bc83fa17a0':