Merge branch 'devel/master' into tizen 82/131882/1
authorJinho, Lee <jeano.lee@samsung.com>
Wed, 31 May 2017 02:30:55 +0000 (11:30 +0900)
committerJinho, Lee <jeano.lee@samsung.com>
Wed, 31 May 2017 02:31:13 +0000 (11:31 +0900)
Change-Id: Icc197125023ac54a46648fbc6acbdd9858a9e743


Trivial merge