OSDN Git Service

Merge "Allow disabling non-system device admins" into nyc-dev am: 9dd15f1bfa
authorMakoto Onuki <omakoto@google.com>
Wed, 24 Feb 2016 23:00:15 +0000 (23:00 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 24 Feb 2016 23:00:15 +0000 (23:00 +0000)
commit8528d88132d05619141134223ea30d0dd29474bd
treec07b165d32762f0425951f1fc12d804642caedca
parent0a0c891ea6dd25534adeb01861abe77835a4bcfa
parentb7cc6e4a7293edeaf93fcf91edabd12326a8046a
Merge "Allow disabling non-system device admins" into nyc-dev am: 9dd15f1bfa
am: b7cc6e4a72

* commit 'b7cc6e4a7293edeaf93fcf91edabd12326a8046a':
  Allow disabling non-system device admins