OSDN Git Service

Merge "[FRP] Remove None and Swipe from screen lock options" into lmp-mr1-dev
authorLucky Zhang <luckyzh@google.com>
Mon, 8 Dec 2014 09:31:45 +0000 (09:31 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Mon, 8 Dec 2014 09:31:46 +0000 (09:31 +0000)

Trivial merge