| commit | cd3e6f990722451d7192c880a917157edcfaceef | [log] [tgz] |
|---|---|---|
| author | Maggie Benthall <mbenthall@google.com> | Tue Aug 20 11:38:37 2013 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Aug 20 11:38:37 2013 -0700 |
| tree | 25d0d4aa928f450189337d892b22778a9d4d1e0c | |
| parent | 816f3058bdd7b888965022888e4a789ea967f444 [diff] | |
| parent | 1cd230a552bcc4196b546321b670e084e643c8d5 [diff] |
am 1cd230a5: Merge "Add methods for managing CAs to DevicePolicyManager(Service)" into klp-dev * commit '1cd230a552bcc4196b546321b670e084e643c8d5': Add methods for managing CAs to DevicePolicyManager(Service)