Merge branch 'devel/master' into tizen 79/141679/1
authorminho.sun <minho.sun@samsung.com>
Tue, 1 Aug 2017 01:09:27 +0000 (10:09 +0900)
committerminho.sun <minho.sun@samsung.com>
Tue, 1 Aug 2017 01:09:36 +0000 (10:09 +0900)
Change-Id: Ia57226a428e157e736be05fd313fb725d2f8fde1


Trivial merge