Merge branch 'tizen_3.0' into tizen_4.0 13/183913/1 accepted/tizen/4.0/unified/20180712.235803 submit/tizen_4.0/20180712.082455
authorLukasz Bardeli <l.bardeli@samsung.com>
Thu, 12 Jul 2018 08:08:07 +0000 (10:08 +0200)
committerLukasz Bardeli <l.bardeli@samsung.com>
Thu, 12 Jul 2018 08:08:07 +0000 (10:08 +0200)
commit48371350deb80c8560b6d7484e80d0aee91a9d9d
tree04ba06cacd11c3f1fdce3a1ed133eaa79a4d0926
parent356a6fea48d632bb957613023c63ddd458a1e043
parent8cacc6d48ce88fefad4fc89c3f41bacad4e13e06
Merge branch 'tizen_3.0' into tizen_4.0

Change-Id: Ib0a0675b868f145f94825b3b209ed779e648df73
packaging/webapi-plugins.spec
src/humanactivitymonitor/humanactivitymonitor_manager.cc