Merge branch 'tizen_3.0' into tizen_4.0 81/171081/1 accepted/tizen/4.0/unified/20180228.140903 submit/tizen_4.0/20180228.082044
authorPiotr Kosko <p.kosko@samsung.com>
Mon, 26 Feb 2018 09:42:08 +0000 (10:42 +0100)
committerPiotr Kosko <p.kosko@samsung.com>
Mon, 26 Feb 2018 09:57:37 +0000 (10:57 +0100)
Change-Id: I402b1950719d6b614070be9b7cf2228339e3f70f

1  2 
packaging/webapi-plugins.spec
src/calendar/calendar_item.cc
src/calendar/calendar_manager.cc
src/filesystem/filesystem_instance.cc
src/nfc/nfc_adapter.cc
src/nfc/nfc_util.cc

Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge