OSDN Git Service

Merge "Dismiss insecure keyguards if FLAG_SHOW_WHEN_LOCKED" into lmp-mr1-dev
authorCraig Mautner <cmautner@google.com>
Tue, 2 Dec 2014 21:13:58 +0000 (21:13 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Tue, 2 Dec 2014 21:14:00 +0000 (21:14 +0000)

Trivial merge