Merge branch 'tizen_4.0' into tizen 95/186895/1 accepted/tizen/unified/20180816.134724 submit/tizen/20180816.094841
authorPiotr Kosko <p.kosko@samsung.com>
Thu, 16 Aug 2018 09:43:33 +0000 (11:43 +0200)
committerPiotr Kosko <p.kosko@samsung.com>
Thu, 16 Aug 2018 09:43:33 +0000 (11:43 +0200)
commit8d3e6dae3e4e34273435e2c7707e4445fccf3dd3
tree706fd01da38a4f135d545ea3f3665a128344335a
parent1b61dd93d0433a818ccfccba9298d820b5c7449b
parent46ea8129a18f584c35cba68e2cc96a9176d78d7a
Merge branch 'tizen_4.0' into tizen

Change-Id: Ibae752b267feae901c0312645fa33e0bdcdc97fd
packaging/webapi-plugins.spec
src/humanactivitymonitor/humanactivitymonitor_api.js