Merge branch 'develop' into tizen_studio_1.1_p3.0
authorJinhyung Jo <jinhyung.jo@samsung.com>
Mon, 12 Dec 2016 07:37:54 +0000 (16:37 +0900)
committerJinhyung Jo <jinhyung.jo@samsung.com>
Mon, 12 Dec 2016 07:38:00 +0000 (16:38 +0900)
Change-Id: I8b5956c8df72c22080c9cb87e3e827fb52bf643e
Signed-off-by: Jinhyung Jo <jinhyung.jo@samsung.com>

Trivial merge