Elliott Hughes c0b8f647ca resolved conflicts for merge of 7545accf to master ...

Change-Id: I7a9264e818fdd14bf59f0dec63ab83985f9e66fb

2015-03-10 10:14:42 -07:00

..

java

Merge "Document behavior change of isUninstallBlocked() since L MR1"

2015-03-10 12:34:57 +00:00

jni

resolved conflicts for merge of 7545accf to master

2015-03-10 10:14:42 -07:00

res

am 1b8df04b: am 8aeab6c8: Allow the keyguard service to be configurable.

2015-03-09 15:49:23 +00:00

tests

Fix handling of LOCAL_JACK_ENABLED

2015-02-23 17:38:58 +01:00