am 7120c7b6: (-s ours) am bf9a425d: Merge "Simplify FingerprintSettings" into mnc-dev

* commit '7120c7b6e65557a05b46c7c915aee1a2390fd610':
This commit is contained in:
Jim Miller
2015-08-27 11:33:18 +00:00
committed by Android Git Automerger

Diff Content Not Available