Merge branch 'devel/master' into tizen
authorWonsik Jung <sidein@samsung.com>
Mon, 11 Jun 2018 06:13:20 +0000 (15:13 +0900)
committerWonsik Jung <sidein@samsung.com>
Mon, 11 Jun 2018 06:13:20 +0000 (15:13 +0900)
Change-Id: Ia9e7fee585a01e44e37f82aecc8d587b1f03a968

1  2 
build/tizen/adaptor/Makefile.am

Simple merge