Steven Moreland 69727778a7 Stop all these merge conflicts. ... Test: mma -j64 Change-Id: I319198af32adf1fef180c5c2c22ba4b360fa7609		2016-10-26 12:04:37 +02:00
..
Android.bp	Stop all these merge conflicts.	2016-10-26 12:04:37 +02:00
IBiometricsFingerprint.hal	Fingerpint: HIDL: Fix annotation typos.	2016-10-21 11:13:03 -07:00
IBiometricsFingerprintClientCallback.hal	Fingerpint: HIDL: Fix annotation typos.	2016-10-21 11:13:03 -07:00
types.hal	Fingerprint: HIDL: add legacy (2.1) interface definition.	2016-10-13 09:20:01 -07:00