Merge "DALi Version 1.2.40" into devel/master
authorAdeel Kazmi <adeel.kazmi@samsung.com>
Fri, 19 May 2017 12:45:17 +0000 (12:45 +0000)
committerGerrit Code Review <gerrit@review.ap-northeast-2.compute.internal>
Fri, 19 May 2017 12:45:17 +0000 (12:45 +0000)

Trivial merge