Paul Lawrence 9502f99089 Merge "Allow encryption when keyguard is set to pattern or no protection"

2014-04-10 14:30:53 +00:00

..

java/com/android/server

Merge "Allow encryption when keyguard is set to pattern or no protection"

2014-04-10 14:30:53 +00:00

jni

…

Android.mk

…