Evan Rosky 2eff745087 Add option to disable lockscreen by default ...

Bug: 27502832
Change-Id: I3e5d024c07a69f3fea1c0450040898c53b732183

2016-06-22 23:49:15 +00:00

..

java

Add option to disable lockscreen by default

2016-06-22 23:49:15 +00:00

jni

Merge "resolve merge conflicts of 79116da to master"

2016-06-22 21:17:45 +00:00

res

Add option to disable lockscreen by default

2016-06-22 23:49:15 +00:00

tests

Merge "Refactor the java side APCT perf test"

2016-06-22 17:05:03 +00:00