OSDN Git Service

Merge "Device Policy API to choose a private key silently"
authorRobin Lee <rgl@google.com>
Mon, 16 Feb 2015 10:47:49 +0000 (10:47 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Mon, 16 Feb 2015 10:47:51 +0000 (10:47 +0000)
commitf6901eb9e277491c9b3dc1fcc5b1f18b1a569ae3
treea415e056871883ae57c6575796ec62f6427febf6
parent421d6ad191563308d31594f53fee804c3d4d1f84
parent3798ed5e0b56ab03e7022a9922b50a4a25474033
Merge "Device Policy API to choose a private key silently"
api/current.txt
api/system-current.txt
core/java/android/app/admin/DeviceAdminReceiver.java
services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java