Merge branch 'devel/master' into tizen_4.0 53/153353/1
authorJinho, Lee <jeano.lee@samsung.com>
Thu, 28 Sep 2017 05:31:39 +0000 (14:31 +0900)
committerJinho, Lee <jeano.lee@samsung.com>
Thu, 28 Sep 2017 05:31:46 +0000 (14:31 +0900)
Change-Id: I057de451aab6a93a76e3b6204b9148f6d1d9feec


Trivial merge