Merge "Merge branch 'devel/master' into tizen" into tizen
authorJinho, Lee <jeano.lee@samsung.com>
Wed, 31 May 2017 12:16:06 +0000 (12:16 +0000)
committerGerrit Code Review <gerrit@review.ap-northeast-2.compute.internal>
Wed, 31 May 2017 12:16:06 +0000 (12:16 +0000)

Trivial merge