Merge easysetup branch into master
authorlankamadan <lanka.madan@samsung.com>
Fri, 11 Sep 2015 13:34:33 +0000 (22:34 +0900)
committerMadan Lanka <lanka.madan@samsung.com>
Wed, 16 Sep 2015 00:31:00 +0000 (00:31 +0000)
commit7aa6219a4656ec0eaeaa43626f6872be5792b2ee
treea124d8e2e66bdec587b19488dfeb9256a1c81492
parent5a26bc5e89375eb7cff3c119f7132cb2f77cc040
parent7aca2c89f54ea3a0ea99b543f0c179aa98bd2fa3
Merge easysetup branch into master

Conflicts:
        resource/csdk/connectivity/SConscript
resource/csdk/stack/src/ocstack.c
        service/SConscript

Change-Id: I1c850a63fe8b10162a8861dc1f9e79269a7d0824
Signed-off-by: lankamadan <lanka.madan@samsung.com>
service/SConscript