Merge "add internal APIs for user consent" into tizen accepted/tizen/unified/20170706.193143 submit/tizen/20170704.105114 submit/tizen/20170705.020445
authorjomui <jongmun.woo@samsung.com>
Tue, 4 Jul 2017 10:48:48 +0000 (10:48 +0000)
committerGerrit Code Review <gerrit@review.ap-northeast-2.compute.internal>
Tue, 4 Jul 2017 10:48:48 +0000 (10:48 +0000)
commitcfc921a24037e805efe129fe0fc73fbfa7d43f55
tree1363bced748518fb703fdc1dc3e560d54b879ce8
parent93a2ac9e2a214cea2ca56d4498c933652b989b5f
parent94cfe7f5e5a1345e2e4371da16cf41900f3be4b3
Merge "add internal APIs for user consent" into tizen
src/api/maps_service.cpp
src/plugin/discovery.h
src/plugin/empty_module.cpp
src/plugin/module.cpp
src/plugin/module.h