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:31:03 +0000 (14:31 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Thu, 10 Apr 2014 14:31:03 +0000 (14:31 +0000)
commit1231a89e5e6fc7032b871852d6cecda868cda416
treeb8551a835687bba864a94b05dbaa77cb0a246b95
parent981efd17786c98180a4b25261b20e61a37d3846f
parentd71c31ef946b35f73a0dded0a32c6ad6afc12227
Merge "Allow encryption when keyguard is set to pattern or no protection"