Jason Monk 69ed33087d Merge "Allow system to disable lockscreen" into mnc-dev

2015-08-07 18:40:19 +00:00

..

java/com/android/server

Merge "Allow system to disable lockscreen" into mnc-dev

2015-08-07 18:40:19 +00:00

jni

Merge "BatteryStats: Decode wakeup reasons in Java" into mnc-dev

2015-07-25 01:14:07 +00:00

Android.mk

…