Merge branch 'devel/master' into tizen_4.0 37/153737/1
authorJinho, Lee <jeano.lee@samsung.com>
Fri, 29 Sep 2017 08:31:37 +0000 (17:31 +0900)
committerJinho, Lee <jeano.lee@samsung.com>
Fri, 29 Sep 2017 08:31:42 +0000 (17:31 +0900)
Change-Id: Ia48a0c59fbc6a3cf0d400789b5a5f079d0f656b0


Trivial merge