Christopher Tate 0b2c2b1005 Merge "Support preferred activities with zero or one scheme in the filter" into klp-dev

2013-11-13 19:33:46 +00:00

..

com/android/server

Merge "Support preferred activities with zero or one scheme in the filter" into klp-dev

2013-11-13 19:33:46 +00:00

Android.mk

Add methods for managing CAs to DevicePolicyManager(Service)

2013-08-20 14:30:36 -04:00