Merge branch 'develop' into tizen_studio_1.1
authorSangJin Kim <sangjin3.kim@samsung.com>
Mon, 19 Dec 2016 05:15:58 +0000 (14:15 +0900)
committerSangJin Kim <sangjin3.kim@samsung.com>
Mon, 19 Dec 2016 05:16:04 +0000 (14:16 +0900)
Change-Id: I8e7762e070361acb04a91e800b1bc8b24f7c4717
Signed-off-by: SangJin Kim <sangjin3.kim@samsung.com>

Trivial merge