Merge branch 'devel/master' into tizen 24/182324/1
authorminho.sun <minho.sun@samsung.com>
Fri, 22 Jun 2018 01:10:05 +0000 (10:10 +0900)
committerminho.sun <minho.sun@samsung.com>
Fri, 22 Jun 2018 01:24:50 +0000 (10:24 +0900)
commit16a62430709186c8ea0e7e56fba5505171eda8ba
tree184ec3bd2060246094dc301e512e00b3c8f62c02
parent88b51bef01f3795a193b4f95afc6cbc15d7604a0
parent6f47bbf93796e50d9d06581107677f94e7dfa3c6
Merge branch 'devel/master' into tizen

Change-Id: Ic675903cd6ea334a519450cbe49fbf72f532318d