From: Piotr Kosko <p.kosko@samsung.com>
Date: Mon, 26 Feb 2018 09:58:41 +0000 (+0100)
Subject: Merge branch 'tizen_4.0' into tizen
X-Git-Tag: submit/tizen/20180228.082430^0
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=refs%2Fchanges%2F83%2F171083%2F1;p=platform%2Fcore%2Fapi%2Fwebapi-plugins.git

Merge branch 'tizen_4.0' into tizen

Conflicts:
	src/nfc/nfc_message_utils.cc

Change-Id: Iec3145fba1c248841abce2dabbd9c912347aa198
---

c582f04f1c6eed9e8fd9f6d25b10eeca1d87fec1