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

* commit '2c8ee8e6e68fca38188379126cbb40c1aa8d5185':
This commit is contained in:
Jim Miller
2015-08-27 20:17:30 +00:00
committed by Android Git Automerger

Diff Content Not Available