Merge branch 'master' into devel 40/201340/4 release-pylint
authorjin.xiao <jin.xiao@samsung.com>
Wed, 13 Mar 2019 01:29:46 +0000 (09:29 +0800)
committerjin.xiao <jin.xiao@samsung.com>
Fri, 15 Mar 2019 03:15:45 +0000 (11:15 +0800)
Change-Id: I21c800342bf4767a3d67bec95fe492b53720cb58


Trivial merge