Merge branch 'develop_p2.3.1' into tizen_studio_1.1_p2.3.1 tizen_studio_1.2_p2.3.1
authorSeokYeon Hwang <syeon.hwang@samsung.com>
Tue, 22 Nov 2016 02:29:43 +0000 (11:29 +0900)
committerSeokYeon Hwang <syeon.hwang@samsung.com>
Tue, 22 Nov 2016 02:29:48 +0000 (11:29 +0900)
Change-Id: Idf7e73eee12b028056134b5c885462200cf083d1
Signed-off-by: SeokYeon Hwang <syeon.hwang@samsung.com>

Trivial merge