Merge branch 'develop' into tizen_studio_1.2
authorMinkee Lee <minkee.lee@samsung.com>
Wed, 17 May 2017 02:27:18 +0000 (11:27 +0900)
committerMinkee Lee <minkee.lee@samsung.com>
Wed, 17 May 2017 02:27:23 +0000 (11:27 +0900)
Change-Id: I4c3cdda6a4b11719fc75cd744ea1b65c9f436ff9
Signed-off-by: Minkee Lee <minkee.lee@samsung.com>

Trivial merge