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)
commit32e7a4547e7a9ac3bab2ecf740c2666d38d35145
tree67d56085060d84d58de3576ed1aa4c00c445273a
parent935fcad9530c484e7942317ed48b7d6faf25f39f
parentb4ce590bef7f97119ef1be5e675af7637d52266b
Merge branch 'tizen_5.0' into tizen

Change-Id: Ia5eb801400de6751e75cc14c50cd90284a64fd37
src/content/content_manager.cc
src/content/content_manager.h