Merge branch 'develop' into tizen_studio_1.1
authorSangJin Kim <sangjin3.kim@samsung.com>
Fri, 9 Dec 2016 09:41:06 +0000 (18:41 +0900)
committerSangJin Kim <sangjin3.kim@samsung.com>
Fri, 9 Dec 2016 09:41:39 +0000 (18:41 +0900)
Change-Id: I1936a5ea1b3dc4ea50f1bc27591af890f5f52edc
Signed-off-by: SangJin Kim <sangjin3.kim@samsung.com>

Trivial merge