Merge branch 'devel/master' into tizen 47/132647/1
authorminho.sun <minho.sun@samsung.com>
Wed, 7 Jun 2017 05:54:18 +0000 (14:54 +0900)
committerminho.sun <minho.sun@samsung.com>
Wed, 7 Jun 2017 05:54:22 +0000 (14:54 +0900)
Change-Id: I95a7a6557ab4dfb8176aa08678bf25838f3357a7


Trivial merge