Merge branch 'develop' into tizen_studio_1.1_p3.0
authorMinkee Lee <minkee.lee@samsung.com>
Mon, 5 Dec 2016 10:02:05 +0000 (19:02 +0900)
committerMinkee Lee <minkee.lee@samsung.com>
Mon, 5 Dec 2016 10:02:16 +0000 (19:02 +0900)
Change-Id: I4d9658f818497ebc9567c3f6c86d400e3487b69b
Signed-off-by: Minkee Lee <minkee.lee@samsung.com>

Trivial merge