Robin Lee 6d3912e2ef Merge "Revert "Publish DevicePolicyManager CA certificate APIs""

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

..

java

Merge "Revert "Publish DevicePolicyManager CA certificate APIs""

2014-06-17 21:55:55 +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

Add attributes and accessors for tinting View drawables

2014-06-17 14:51:45 -07:00

tests

Merge "IpPrefix improvements."

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