Merge branch 'develop' into tizen_studio_1.1_p3.0
authorSeokYeon Hwang <syeon.hwang@samsung.com>
Thu, 24 Nov 2016 07:52:51 +0000 (16:52 +0900)
committerSeokYeon Hwang <syeon.hwang@samsung.com>
Thu, 24 Nov 2016 07:52:54 +0000 (16:52 +0900)
Change-Id: Ie7cf805c412920ae4e945c3996cc8534eceee641
Signed-off-by: SeokYeon Hwang <syeon.hwang@samsung.com>

Trivial merge