Merge branch 'tizen_5.0' into tizen 03/197103/1 accepted/tizen/unified/20190111.055155 submit/tizen/20190109.233706
authorPiotr Kosko/Native/Web API (SWP) /SRPOL/Professional/삼성전자 <p.kosko@samsung.com>
Wed, 9 Jan 2019 11:48:01 +0000 (12:48 +0100)
committerPiotr Kosko/Native/Web API (SWP) /SRPOL/Professional/삼성전자 <p.kosko@samsung.com>
Wed, 9 Jan 2019 11:48:01 +0000 (12:48 +0100)
Change-Id: Ia5eb801400de6751e75cc14c50cd90284a64fd37

1  2 
src/content/content_manager.cc
src/content/content_manager.h

Simple merge
Simple merge