Craig Mautner 8e867f3810 am e0bebd29: am 0857e3b9: am 24ba3234: Merge "Do not delete stacks that are not empty." into klp-dev ...

* commit 'e0bebd294e7d2b998cc71e77e99f311c6321a6a1':
  Do not delete stacks that are not empty.

2013-10-21 21:41:47 -07:00

..

com/android/server

am e0bebd29: am 0857e3b9: am 24ba3234: Merge "Do not delete stacks that are not empty." into klp-dev

2013-10-21 21:41:47 -07:00

Android.mk

Add methods for managing CAs to DevicePolicyManager(Service)

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