Merge "Wifi & Bluetooth: use binding address defined in main.cpp"

author Jan-Simon Moeller <jsmoeller@linuxfoundation.org>

Thu, 22 Dec 2016 13:44:21 +0000 (13:44 +0000)

committer Gerrit Code Review <gerrit@automotivelinux.org>

Thu, 22 Dec 2016 13:44:21 +0000 (13:44 +0000)
author Jan-Simon Moeller <jsmoeller@linuxfoundation.org>
Thu, 22 Dec 2016 13:44:21 +0000 (13:44 +0000)
committer Gerrit Code Review <gerrit@automotivelinux.org>
Thu, 22 Dec 2016 13:44:21 +0000 (13:44 +0000)
diff --cc app/bluetooth/Bluetooth.qml
Simple merge
diff --cc app/wifi/Wifi.qml
Simple merge
author	Jan-Simon Moeller <jsmoeller@linuxfoundation.org>
	Thu, 22 Dec 2016 13:44:21 +0000 (13:44 +0000)
committer	Gerrit Code Review <gerrit@automotivelinux.org>
	Thu, 22 Dec 2016 13:44:21 +0000 (13:44 +0000)
		1	2
app/bluetooth/Bluetooth.qml	patch \|	diff1 \|	diff2 \|	blob \| history
app/wifi/Wifi.qml	patch \|	diff1 \|	diff2 \|	blob \| history