Merge branch 'devel/master' into tizen 56/132656/1
authorminho.sun <minho.sun@samsung.com>
Wed, 7 Jun 2017 05:55:54 +0000 (14:55 +0900)
committerminho.sun <minho.sun@samsung.com>
Wed, 7 Jun 2017 05:56:02 +0000 (14:56 +0900)
Change-Id: I88623c69468ba25730b9265dbd9a0bad1b803ee7


Trivial merge