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

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

..

java

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

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

jni

resolved conflicts for merge of 286a247e to master

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

res

Merge "Update list item text appearance"

2014-04-09 23:54:24 +00:00

tests

Merge "A stress test for concurent multidex extraction."

2014-04-09 09:49:58 +00:00