OSDN Git Service

Merge "Allow encryption when keyguard is set to pattern or no protection"
authorPaul Lawrence <paullawrence@google.com>
Thu, 10 Apr 2014 14:30:52 +0000 (14:30 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Thu, 10 Apr 2014 14:30:53 +0000 (14:30 +0000)
commit9502f990899ef576879048ec5147d403158ad89d
treea8037581d44d532b9ceb0e17f36c0154beb51c4e
parentedd6d9e3a87d47b42d9119b70d1f442c3fa98c35
parent46791e752ca1eca35e6a882c47d7de7f4f66687c
Merge "Allow encryption when keyguard is set to pattern or no protection"
core/java/android/os/storage/IMountService.java
services/core/java/com/android/server/MountService.java