Merge remote-tracking branch 'sandbox/zabramowska/hybrid' into tizen 75/90175/3
authorRafal Krypa <r.krypa@samsung.com>
Thu, 29 Sep 2016 14:33:11 +0000 (16:33 +0200)
committerRafal Krypa <r.krypa@samsung.com>
Thu, 29 Sep 2016 14:34:52 +0000 (16:34 +0200)
commitf8e5f334275c3284e7b9145636446ca233914f1c
treef6057be22728e4b84e25a925f858bbc4d26779f7
parentde905ae9e45026537214b1a55fd14345ecf511a4
parenta39a879b1a9e851d1469f3a503e5a37bee8af4ee
Merge remote-tracking branch 'sandbox/zabramowska/hybrid' into tizen

Change-Id: I02ff2db20b2ff327724fc574ad16f86cceb84efa
src/client/client-common.cpp
src/client/client-security-manager.cpp
src/client/include/client-common.h
src/common/permissible-set.cpp
src/common/service_impl.cpp