Merge branch 'devel/master' into tizen 08/62908/1
authorminho.sun <minho.sun@samsung.com>
Mon, 21 Mar 2016 02:37:25 +0000 (11:37 +0900)
committerminho.sun <minho.sun@samsung.com>
Mon, 21 Mar 2016 05:46:49 +0000 (14:46 +0900)
Change-Id: I470813262016ed02584036257c9329a1f37ea28e

1  2 
build/tizen/adaptor/Makefile.am

Simple merge