Merge "Merge branch '1.1-rel'"

author Ashok Babu Channa <ashok.channa@samsung.com>

Thu, 19 May 2016 12:05:16 +0000 (12:05 +0000)

committer Gerrit Code Review <gerrit@172.30.200.205>

Thu, 19 May 2016 12:05:17 +0000 (12:05 +0000)
author Ashok Babu Channa <ashok.channa@samsung.com>
Thu, 19 May 2016 12:05:16 +0000 (12:05 +0000)
committer Gerrit Code Review <gerrit@172.30.200.205>
Thu, 19 May 2016 12:05:17 +0000 (12:05 +0000)
diff --cc resource/csdk/connectivity/src/bt_le_adapter/android/caleclient.c
Simple merge
diff --cc resource/csdk/connectivity/src/bt_le_adapter/caleadapter.c
Simple merge
diff --cc resource/csdk/connectivity/src/ip_adapter/caipserver.c
Simple merge
author	Ashok Babu Channa <ashok.channa@samsung.com>
	Thu, 19 May 2016 12:05:16 +0000 (12:05 +0000)
committer	Gerrit Code Review <gerrit@172.30.200.205>
	Thu, 19 May 2016 12:05:17 +0000 (12:05 +0000)
		1	2
resource/csdk/connectivity/src/bt_le_adapter/android/caleclient.c	patch \|	diff1 \|	diff2 \|	blob \| history
resource/csdk/connectivity/src/bt_le_adapter/caleadapter.c	patch \|	diff1 \|	diff2 \|	blob \| history
resource/csdk/connectivity/src/ip_adapter/caipserver.c	patch \|	diff1 \|	diff2 \|	blob \| history