platform_hardware_interfaces/bluetooth/Android.bp

// This is an autogenerated file, do not edit.
subdirs = [
    "1.0",
    "1.0/default",
    "1.0/vts/functional",
]
Stop all these merge conflicts. Test: mma -j64 Change-Id: I319198af32adf1fef180c5c2c22ba4b360fa7609 2016-10-26 00:45:19 +02:00			`// This is an autogenerated file, do not edit.`
			`subdirs = [`
			`"1.0",`
Add default Bluetooth HAL implementation Also added initial target-side functional test. Test: bluetooth_hidl_hal_test Bug: 31972505 Change-Id: I1f574a5b2b53d7fbf65dbb4e1aaa5f8b6c5a9448 2016-10-14 00:45:02 +02:00			`"1.0/default",`
			`"1.0/vts/functional",`
Stop all these merge conflicts. Test: mma -j64 Change-Id: I319198af32adf1fef180c5c2c22ba4b360fa7609 2016-10-26 00:45:19 +02:00			`]`