Merge branch 'develop' into tizen_studio_1.1_p3.0
authorjihye <jihye424.kim@samsung.com>
Mon, 5 Dec 2016 05:37:43 +0000 (14:37 +0900)
committerjihye <jihye424.kim@samsung.com>
Mon, 5 Dec 2016 05:38:06 +0000 (14:38 +0900)
Change-Id: I0e026927953303ebe8374500ec6aab2df70a0f90
Signed-off-by: jihye <jihye424.kim@samsung.com>

Trivial merge