Merge branch 'devel/master' into tizen 61/137161/1
authorJinho, Lee <jeano.lee@samsung.com>
Tue, 4 Jul 2017 12:52:03 +0000 (21:52 +0900)
committerJinho, Lee <jeano.lee@samsung.com>
Tue, 4 Jul 2017 12:52:12 +0000 (21:52 +0900)
Change-Id: Ie31341e5982d1a9af4507e9659ba08fe5cf20369

1  2 
build/tizen/adaptor/Makefile.am

Simple merge