Merge branch 'tizen_p2.3.1' into tizen_studio_2.0_p2.3.1 65/163565/1 tizen_studio_2.0_p2.3.1 tizen_studio_3.0_p2.3.1
authorminkee.lee <minkee.lee@samsung.com>
Tue, 12 Dec 2017 05:44:29 +0000 (14:44 +0900)
committerminkee.lee <minkee.lee@samsung.com>
Tue, 12 Dec 2017 05:44:33 +0000 (14:44 +0900)
Change-Id: I2565328fcceb9f9b82be58d4e600a0b22486410b
Signed-off-by: minkee.lee <minkee.lee@samsung.com>

Trivial merge