Merge branch 'devel/master' into tizen 00/182300/1
authorminho.sun <minho.sun@samsung.com>
Fri, 22 Jun 2018 01:09:01 +0000 (10:09 +0900)
committerminho.sun <minho.sun@samsung.com>
Fri, 22 Jun 2018 01:13:49 +0000 (10:13 +0900)
commitad9c30c225f7f4fa4da639ca1e5153936720f9f7
tree4c00099ef2997069993743b6b94ae8adc95c658f
parentdd85f8cb2b8301b710a1474ead5bb980b1527efa
parent0705f1f011438a2a768644d90dfb1e2f77d6bb40
Merge branch 'devel/master' into tizen

Change-Id: I1c7841144f6a8a0eebd3a5436fd9d71a1b4dea43