Dianne Hackborn 529ae9e127 am 12caef78: am 71ab245a: Merge "Fix issue #11536426 DO NOT MERGE" into klp-dev ...

* commit '12caef7836a21fa20d052e4868df92e23b930cf6':
  Fix issue #11536426 DO NOT MERGE

2014-03-06 20:05:29 +00:00

..

com/android/server

am 12caef78: am 71ab245a: Merge "Fix issue #11536426 DO NOT MERGE" into klp-dev

2014-03-06 20:05:29 +00:00

Android.mk

Add methods for managing CAs to DevicePolicyManager(Service)

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