Merge branch 'develop' into tizen_studio_1.1_p3.0
authorSeokYeon Hwang <syeon.hwang@samsung.com>
Mon, 19 Dec 2016 11:24:26 +0000 (20:24 +0900)
committerSeokYeon Hwang <syeon.hwang@samsung.com>
Mon, 19 Dec 2016 11:24:44 +0000 (20:24 +0900)
Change-Id: Ie0fa51ac5909498500911acc083d0afa4b3f4336
Signed-off-by: SeokYeon Hwang <syeon.hwang@samsung.com>

Trivial merge