Merge with master 70/146070/1
authorJin Yoon <jinny.yoon@samsung.com>
Thu, 24 Aug 2017 23:38:34 +0000 (08:38 +0900)
committerJin Yoon <jinny.yoon@samsung.com>
Thu, 24 Aug 2017 23:38:34 +0000 (08:38 +0900)
commit69d6254236ed7cc190d38909aa6ad8be64f4b89e
tree38c56d3e3f07a036d83063b59e2a86b07d650970
parent4bc3464e99ae4944f9ec925ee4374195f8506fdd
Merge with master

Change-Id: Ia642f1e9d29f766900c65e01103f8ead2b553844
inc/connectivity.h
inc/connectivity_internal.h
src/connectivity.c
src/controller.c
src/controller_internal.c