Merge branch 'tizen_3.0' into tizen_4.0 42/169242/1 accepted/tizen/4.0/unified/20180205.144611 submit/tizen_4.0/20180205.082909
authorPiotr Kosko <p.kosko@samsung.com>
Mon, 5 Feb 2018 06:57:27 +0000 (07:57 +0100)
committerPiotr Kosko <p.kosko@samsung.com>
Mon, 5 Feb 2018 06:57:32 +0000 (07:57 +0100)
commitb942a82de274c9eb2d7d3ade5ee1cc1c8e1ffd0d
tree8b412edfd02075ebfbcecd224cd462ccafb83f9e
parentcd1c34159467ade993b575a633e78c52134bbab5
parent868d6551b4d2ca28a0cf597673d82e6c765ba92f
Merge branch 'tizen_3.0' into tizen_4.0

Change-Id: I341501004603b29f58f41320ab1093f09f039af6
packaging/webapi-plugins.spec
src/nfc/nfc_api.js
src/nfc/nfc_util.cc