| commit | c61c0670422116af8d5fee83b08a59d6133894cc | [log] [tgz] |
|---|---|---|
| author | Jim Miller <jaggies@google.com> | Fri Jul 18 21:34:07 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Jul 18 21:34:07 2014 +0000 |
| tree | 539bbe9e348c33de2cdd2dc96ca9c90019091b3c | |
| parent | 892d049fa5bc4e14913905b25c9d0ce1255e8228 [diff] | |
| parent | 43096b2bba5d4427288615e88b3b78a609fb6991 [diff] |
am 0f6db1e8: Merge "Add DevicePolicyManager flag for fingerprint." into lmp-dev * commit '0f6db1e823a96d14ea831ec2bccc435dd321da28': Add DevicePolicyManager flag for fingerprint.