John Reck b65f0d5f08 Merge "Fix setLayerType"

2014-06-17 21:13:21 +00:00

..

java

Merge "Fix setLayerType"

2014-06-17 21:13:21 +00:00

jni

Merge "First pass at FingerprintService integration with HAL. Move FingerprintService to framework services directory Fix merge conflicts."

2014-06-17 21:07:42 +00:00

res

Merge "Switch everything to scheduled jobs"

2014-06-17 20:55:27 +00:00

tests

Merge "IpPrefix improvements."

2014-06-17 04:11:04 +00:00