OSDN Git Service

Merge "Settings: Ensure CryptKeeper dismisses secure keyguards." into lmp-dev
authorJohn Spurlock <jspurlock@google.com>
Wed, 17 Sep 2014 19:37:27 +0000 (19:37 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Wed, 17 Sep 2014 19:37:27 +0000 (19:37 +0000)

Trivial merge