OSDN Git Service

am 3e239fe0: am 73ae2d3a: Merge "[FRP] Remove None and Swipe from screen lock options...
authorLucky Zhang <luckyzh@google.com>
Mon, 8 Dec 2014 19:41:44 +0000 (19:41 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Mon, 8 Dec 2014 19:41:44 +0000 (19:41 +0000)
commita4df9673896bf7fb317b8ae92246b555d712a79d
tree35fc6572ffe8c2a1671b24e9ba4969f6ea166a7c
parent86ed2cf33fa82aac1606e2a6e217fdff4ef6ef8f
parent3e239fe0d8b09b950e87339a1814040bb4208fe2
am 3e239fe0: am 73ae2d3a: Merge "[FRP] Remove None and Swipe from screen lock options" into lmp-mr1-dev

* commit '3e239fe0d8b09b950e87339a1814040bb4208fe2':
  [FRP] Remove None and Swipe from screen lock options