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:37:45 +0000 (19:37 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 16 Feb 2016 19:37:45 +0000 (19:37 +0000)
commit2404c9a2bc04e55e3250ea9a9db986ba12ebce1e
tree9f9c723a0ee97274d5f782ccdc26157462b02153
parentd4e589365d52800b00c888cad60eec6cc8b174ec
parentf79c887c5997f4a7735987a524869421a1a3ac2d
Merge "Let admin disable fingerprint for the work challenge" into nyc-dev
am: f79c887c59

* commit 'f79c887c5997f4a7735987a524869421a1a3ac2d':
  Let admin disable fingerprint for the work challenge