Paul Lawrence b127613d85 am 9502f990: Merge "Allow encryption when keyguard is set to pattern or no protection" ...

* commit '9502f990899ef576879048ec5147d403158ad89d':
  Allow encryption when keyguard is set to pattern or no protection

2014-04-10 14:35:25 +00:00

..

android

am 9502f990: Merge "Allow encryption when keyguard is set to pattern or no protection"

2014-04-10 14:35:25 +00:00

com

resolved conflicts for merge of 286a247e to master

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

jarjar-rules.txt

…

overview.html

…