Jim Miller a6754bb884 am 7aa535a8: am 01edb226: am ed7376fc: Merge "Restore permission check in keyguard." into klp-dev ...

* commit '7aa535a8633ec93426381c68dc061cd951ab5832':
  Restore permission check in keyguard.

2013-11-08 16:31:11 -08:00

..

com/android/server

am 7aa535a8: am 01edb226: am ed7376fc: Merge "Restore permission check in keyguard." into klp-dev

2013-11-08 16:31:11 -08:00

Android.mk

Add methods for managing CAs to DevicePolicyManager(Service)

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