Merge branch 'develop' into tizen_studio_1.1_p3.0
authorJinhyung Choi <jinh0.choi@samsung.com>
Fri, 16 Dec 2016 03:26:31 +0000 (12:26 +0900)
committerJinhyung Choi <jinh0.choi@samsung.com>
Fri, 16 Dec 2016 03:26:36 +0000 (12:26 +0900)
Change-Id: Ib65317beecdff07bb141bc87b7a62e869a6502b5
Signed-off-by: Jinhyung Choi <jinh0.choi@samsung.com>

Trivial merge