Merge branch 'devel/master' into tizen 19/182319/1
authorminho.sun <minho.sun@samsung.com>
Fri, 22 Jun 2018 01:09:46 +0000 (10:09 +0900)
committerminho.sun <minho.sun@samsung.com>
Fri, 22 Jun 2018 01:24:57 +0000 (10:24 +0900)
commit20d135f6ee7ac35ffc552f85b21c7e218cdf170c
tree55e58553971d0accc0c45a8b70b8511ca1ad17a7
parent3ea29453f78489ade515243f0c129f68d95e8899
parent81784fe0ad47627e0a98eeda3e496087bff6a781
Merge branch 'devel/master' into tizen

Change-Id: Ia901c87ac96c3072f00bdfd0fde9843699740a73