Merge "Merge branch '1.1-rel'"
authorAshok Babu Channa <ashok.channa@samsung.com>
Thu, 19 May 2016 12:05:16 +0000 (12:05 +0000)
committerGerrit Code Review <gerrit@172.30.200.205>
Thu, 19 May 2016 12:05:17 +0000 (12:05 +0000)
commit9c19498809f7e49a9ae68114fb0e1250ca15f55c
tree590182e7e686d63adb48bfb3dcc2d80f905f3e9c
parentd6b3ce170e6511c5b126a5f49197ccc8f862a0fd
parent442026128ead8780fa45d0db8a6f17be7c9220e0
Merge "Merge branch '1.1-rel'"
resource/csdk/connectivity/src/bt_le_adapter/android/caleclient.c
resource/csdk/connectivity/src/bt_le_adapter/caleadapter.c
resource/csdk/connectivity/src/ip_adapter/caipserver.c