Merge branch 'dev_rtt' of github.sec.samsung.net:seonah1-moon/nan-manager into dev_rtt
authorSeonah Moon <seonah1.moon@samsung.com>
Mon, 20 Jul 2020 12:01:41 +0000 (21:01 +0900)
committerSeonah Moon <seonah1.moon@samsung.com>
Mon, 20 Jul 2020 12:01:41 +0000 (21:01 +0900)
1  2 
src/NanServiceProvider.cpp

Simple merge