Merge branch 'devel/master' into tizen 22/72222/1
authorsuhyung Eom <suhyung.eom@samsung.com>
Tue, 31 May 2016 07:47:35 +0000 (16:47 +0900)
committersuhyung Eom <suhyung.eom@samsung.com>
Tue, 31 May 2016 07:48:07 +0000 (16:48 +0900)
commitc7cebcfdbd3046b6321d3c321799275c5e3fc3d8
tree057e0653cc6c261bd889479e2418c9ccf6e2ecc7
parent885f94a308af20ddf2eabb54cd123bbaa7738c1f
parent8d1edde184c48e95af1599f1605b21dcc2a4ea7b
Merge branch 'devel/master' into tizen

Change-Id: Ie305c6368f8c98123674cd53ef22886d79a8e6ad
build/tizen/adaptor/Makefile.am