OSDN Git Service

Merge "Let admin disable fingerprint for the work challenge" into nyc-dev
authorEsteban Talavera <etalavera@google.com>
Tue, 16 Feb 2016 19:29:06 +0000 (19:29 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Tue, 16 Feb 2016 19:29:07 +0000 (19:29 +0000)
commitf79c887c5997f4a7735987a524869421a1a3ac2d
treeb058d43030604462786448b6359b0b08aa5e3f0d
parentf8872b0a37024c78dbfcf6f19d63c9555eec4709
parent2547071ff8d83dc51c915a56202081ca3a100b23
Merge "Let admin disable fingerprint for the work challenge" into nyc-dev
services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java