Merge branch 'tizen_3.0' into tizen accepted/tizen/common/20161206.131736 accepted/tizen/ivi/20161207.030125 accepted/tizen/mobile/20161207.030029 accepted/tizen/tv/20161207.030045 accepted/tizen/wearable/20161207.030106 submit/tizen/20161206.092612
authorHyunjin Park <hj.na.park@samsung.com>
Tue, 6 Dec 2016 08:28:03 +0000 (17:28 +0900)
committerHyunjin Park <hj.na.park@samsung.com>
Tue, 6 Dec 2016 08:28:03 +0000 (17:28 +0900)
commit2035e5e835b868f8f17540e7d3c5a573422666a5
treef59a15df1cd008d56b8a00b84e602aff8d82835a
parent78a6fb8faca5078bd84d802512858b2964a2b06a
parent32058695f14106f7bc01a0de8d86f006b89043eb
Merge branch 'tizen_3.0' into tizen
src/convergence/convergence_instance.cc
src/convergence/convergence_remote_app_control_service.cc
src/convergence/convergence_utils.cc