Merge branch 'tizen_4.0' into tizen 83/171083/1 submit/tizen/20180228.082430
authorPiotr Kosko <p.kosko@samsung.com>
Mon, 26 Feb 2018 09:58:41 +0000 (10:58 +0100)
committerPiotr Kosko <p.kosko@samsung.com>
Mon, 26 Feb 2018 09:58:41 +0000 (10:58 +0100)
commitc582f04f1c6eed9e8fd9f6d25b10eeca1d87fec1
treee78fdbd4e75ed144758513c81cfcbc74128110e5
parent5d7f36766a5742d681a9c61a957bb06e477c38d7
parente06b5add605be33d5813bc2311a5e34b15b8e722
Merge branch 'tizen_4.0' into tizen

Conflicts:
src/nfc/nfc_message_utils.cc

Change-Id: Iec3145fba1c248841abce2dabbd9c912347aa198
packaging/webapi-plugins.spec
src/messageport/messageport_instance.cc