Merge branch 'devel/master' into tizen 69/141669/1
authorminho.sun <minho.sun@samsung.com>
Tue, 1 Aug 2017 01:05:25 +0000 (10:05 +0900)
committerminho.sun <minho.sun@samsung.com>
Tue, 1 Aug 2017 01:05:29 +0000 (10:05 +0900)
Change-Id: Ie317eb21872639948348aa7bce28387a2d2f916e


Trivial merge