OSDN Git Service

Merge "DPMS shouldn't remove admins that aren't crypto aware." into nyc-dev
authorKenny Guy <kennyguy@google.com>
Thu, 11 Feb 2016 19:27:21 +0000 (19:27 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Thu, 11 Feb 2016 19:27:22 +0000 (19:27 +0000)
commit641ea634eeebc52b7bdc825b32dc22881d63ae30
tree058ac30d2ecd7d2af295e8bdb4bd1407dd0b2461
parent567704bca22c08a6fbfdaa15d054e0e3124b38e8
parent44fc4aeb1f3a6fcc6c1b8532530cb0589b2815c4
Merge "DPMS shouldn't remove admins that aren't crypto aware." into nyc-dev
services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java