Merge remote-tracking branch 'master/develop' into tizen_studio_2.0
authorbdragon.park <bdragon.park@samsung.com>
Tue, 17 Oct 2017 08:45:16 +0000 (17:45 +0900)
committerbdragon.park <bdragon.park@samsung.com>
Tue, 17 Oct 2017 08:45:16 +0000 (17:45 +0900)

Trivial merge