Merge branch 'devel/master' into tizen 94/182294/1
authorminho.sun <minho.sun@samsung.com>
Fri, 22 Jun 2018 01:02:02 +0000 (10:02 +0900)
committerminho.sun <minho.sun@samsung.com>
Fri, 22 Jun 2018 01:13:15 +0000 (10:13 +0900)
commitb954037efe7628e1a4b8f121136679778b5a602a
tree014ad7afe89cf477460bfb6f2f6dce4d688ba8a6
parentf69da1df23c0663ab3a815af48f9f70adb52438c
parent6caee129a6b690135156363bafe8831a3f7b4aaf
Merge branch 'devel/master' into tizen

Change-Id: I6a00ae448adb44b8ab3e0f411a33bdce72665bae