OSDN Git Service

Merge "Fix DPM.resetPassword("")" into lmp-mr1-dev
authorAdrian Roos <roosa@google.com>
Mon, 24 Nov 2014 16:02:09 +0000 (16:02 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Mon, 24 Nov 2014 16:02:11 +0000 (16:02 +0000)
commit702d9e31b1bcacff975a2b8e0d04160bbd6811ed
tree5783311b109e6341cba16da9a34ef2c3281e6959
parent671424951dcd2a0d1059c6d899a8649cbc8b5e26
parentf8f56bce428bb2b89d1d572ccd2d604761dbbce8
Merge "Fix DPM.resetPassword("")" into lmp-mr1-dev
core/java/android/app/admin/DevicePolicyManager.java
services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java