Martijn Coenen a6c17a6875 Merge "Load legacy NFC libhardware HAL by correct name." am: 9e172b30c7 am: b2222e2132 am: f27d2d49a1 ... am: ef6457f4f7 Change-Id: I38a366d252d61e02e2093cfded29df78633d4448		2017-01-13 08:50:39 +00:00
..
1.0	Merge "Load legacy NFC libhardware HAL by correct name." am: 9e172b30c7 am: b2222e2132 am: f27d2d49a1	2017-01-13 08:50:39 +00:00
Android.bp	Stop all these merge conflicts.	2016-10-26 12:05:29 +02:00
Android.mk	move VTS HIDL HAL tests to the corresponding interface directories	2017-01-12 11:02:22 -08:00