Merge branch 'devel/master' into tizen 64/131864/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: I42b6f15ace243810cebc558afb3d55ecb0cd6e65


Trivial merge