Elliott Hughes 126d89bb79 Merge "resolved conflicts for merge of 7545accf to master"

2015-03-10 17:15:42 +00:00

..

java

Merge "Rename and simplify DisplayList Canvas classes"

2015-03-10 16:29:01 +00:00

jni

Merge "resolved conflicts for merge of 7545accf to master"

2015-03-10 17:15:42 +00: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