Merge branch 'tizen_p2.3.1' into tizen_studio_2.0_p2.3.1 48/163548/1
authorminkee.lee <minkee.lee@samsung.com>
Tue, 12 Dec 2017 03:28:44 +0000 (12:28 +0900)
committerminkee.lee <minkee.lee@samsung.com>
Tue, 12 Dec 2017 03:28:48 +0000 (12:28 +0900)
Change-Id: Ib51fc20fb8c0e7d6812871af3af794e4e7fb67be
Signed-off-by: minkee.lee <minkee.lee@samsung.com>

Trivial merge