Merge branch 'devel/master' into tizen
authorminho.sun <minho.sun@samsung.com>
Thu, 2 Aug 2018 01:20:09 +0000 (10:20 +0900)
committerminho.sun <minho.sun@samsung.com>
Thu, 2 Aug 2018 01:20:09 +0000 (10:20 +0900)
commit8955cab42389e75ce418f4e105124074667c1524
tree50e7d2d6ba5ad1c6fea28882733cefda4e3706d1
parent9d839f746c8bab5bb957d712c834c3e69c3e44ba
parenta060574ce34608120137d2a8973c4dff821836a6
Merge branch 'devel/master' into tizen
build/tizen/adaptor/Makefile.am