tree 0da55d052f8472da02e7eaf5493173fbc3591b99
parent 47585f462a9cde661169b16cea870c05e91d92f8
parent c8b5e94c2b65ddd92690c90038070e6dd31ddc78
author Jim Miller <jaggies@google.com> 1434427507 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1434427507 +0000

am c8b5e94c: am b1c6208c: Merge "Limit number of fingerprint templates that can be enrolled per device user" into mnc-dev

* commit 'c8b5e94c2b65ddd92690c90038070e6dd31ddc78':
  Limit number of fingerprint templates that can be enrolled per device user