Merge branch 'develop' into tizen_studio_1.1
authorSangJin Kim <sangjin3.kim@samsung.com>
Mon, 19 Dec 2016 09:23:50 +0000 (18:23 +0900)
committerSangJin Kim <sangjin3.kim@samsung.com>
Mon, 19 Dec 2016 09:23:59 +0000 (18:23 +0900)
Change-Id: Ie0622f60282ca5b130e5c6841652a12e27d6430d
Signed-off-by: SangJin Kim <sangjin3.kim@samsung.com>

Trivial merge