ASACORE-551 Fix local discovery over non-local tranpsorts.

Change-Id: Iab2ad6636746e1632fadc78b2c7491475e2f4ead
Signed-off-by: M. Sanu <msanu@qce.qualcomm.com>
ASACORE-1004 fix segfault in SessionlessObj

Change-Id: I9862f37b7a6bb3bca9c3cf28658698dc8ff9c3b6
Signed-off-by: Meggan Ehret <meggan@qeo.org>
ASACORE-232: Remove references to Bluetooth

Change-Id: Icba4e4d2193e354bc9373a9f56b1dc483f6b0d1e
Signed-off-by: Steve Kinneberg <stevek@qce.qualcomm.com>
Merge "ASACORE-232: Remove references to Bluetooth"
Merge "ASACORE-551 Fix local discovery over non-local tranpsorts."
Merge "ASACORE-1004 fix segfault in SessionlessObj"
ASACORE-1010 Reduce memory footprint on Windows

ASACORE-1010 Reduce memory footprint on Windows by taking advantage
of on-demand stack memory commit

Change-Id: I6d9d2ffd32fdb2d0fde849c7afb01332fdd7bc36
Signed-off-by: Dan Mihai <DMihai@microsoft.com>
Copy status codes from feature/about_rework

Change-Id: I3d2d8f5898dccc4a203519e81d61bceb4670fc29
Signed-off-by: Ry Jones <c_lawren@qce.qualcomm.com>
Merge remote-tracking branch 'origin/master' into feature/udp_transport

Conflicts:
	alljoyn_core/router/test/SConscript
	alljoyn_core/src/Transport.h

Change-Id: Ibcbee6fe1265a16ed1e01f3ac684a8a58eed0362
Signed-off-by: Craig Dowell <cdowell@qce.qualcomm.com>
Merge remote-tracking branch 'origin/feature/udp_transport' into temp/integration-14.10

Change-Id: Ibea856656eb86ce5c7cb53d7c8ebea2f644d7383
Signed-off-by: QCE Seabuild <qce.seabuild@qce.qualcomm.com>