Merge branch 'devel/master' into tizen 46/137146/1
authorJinho, Lee <jeano.lee@samsung.com>
Tue, 4 Jul 2017 05:53:51 +0000 (14:53 +0900)
committerJinho, Lee <jeano.lee@samsung.com>
Tue, 4 Jul 2017 06:01:57 +0000 (15:01 +0900)
Change-Id: I38bb2daa0fe3eca531b7d79d9d9dae26ffcecfc2


Trivial merge