Christopher Tate a46c7f32d3 am 87b84ca6: am e995ad15: am 0b2c2b10: Merge "Support preferred activities with zero or one scheme in the filter" into klp-dev ...

* commit '87b84ca6fc5070f2fbbb5f6d94863680b33d188b':
  Support preferred activities with zero or one scheme in the filter

2013-11-13 12:20:08 -08:00

..

com/android/server

am 87b84ca6: am e995ad15: am 0b2c2b10: Merge "Support preferred activities with zero or one scheme in the filter" into klp-dev

2013-11-13 12:20:08 -08:00

Android.mk

Add methods for managing CAs to DevicePolicyManager(Service)

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