Jim Miller 7802f42124 Merge "clean up default fingerprint HIDL@2.1 implementation"		2017-01-26 05:38:44 +00:00
..
fingerprint/2.1	Merge "clean up default fingerprint HIDL@2.1 implementation"	2017-01-26 05:38:44 +00:00
Android.bp	Stop all these merge conflicts.	2016-10-26 12:04:37 +02:00