OSDN Git Service

Merge "Fix "None" lock screen option"
authorJorim Jaggi <jjaggi@google.com>
Wed, 2 Jul 2014 14:53:33 +0000 (14:53 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Tue, 1 Jul 2014 17:52:42 +0000 (17:52 +0000)

Trivial merge