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

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

..

android

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

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

com

resolved conflicts for merge of 286a247e to master

2014-04-10 10:38:31 +01:00

jarjar-rules.txt

…

overview.html

…