Jim Miller e2e945a887 am 40c4021a: Merge "third part apps can disable the secret lockscreen"
* commit '40c4021a70c56bcc4d6f6569d795dff52ab4e369':
  third part apps can disable the secret lockscreen
2015-04-07 22:58:53 +00:00
..
2015-03-18 06:04:44 -07:00