Merge branch 'develop' into tizen_studio_1.1_p3.0
authorSeokYeon Hwang <syeon.hwang@samsung.com>
Tue, 8 Nov 2016 10:57:03 +0000 (19:57 +0900)
committerSeokYeon Hwang <syeon.hwang@samsung.com>
Tue, 8 Nov 2016 10:57:07 +0000 (19:57 +0900)
Change-Id: Id7a51a3f1b8bf77105c41ab9ade688882f9dc6a4
Signed-off-by: SeokYeon Hwang <syeon.hwang@samsung.com>

Trivial merge