Merge branch 'devel/master' into tizen_4.0 37/153337/1
authorJinho, Lee <jeano.lee@samsung.com>
Thu, 28 Sep 2017 04:37:33 +0000 (13:37 +0900)
committerJinho, Lee <jeano.lee@samsung.com>
Thu, 28 Sep 2017 08:49:04 +0000 (17:49 +0900)
Change-Id: I9cce8b2a716e377428cf6d3da1058eda219fdd46


Trivial merge