Merge "DALi Version 1.2.49" into devel/master
authorAdeel Kazmi <adeel.kazmi@samsung.com>
Fri, 21 Jul 2017 13:27:49 +0000 (13:27 +0000)
committerGerrit Code Review <gerrit@review.ap-northeast-2.compute.internal>
Fri, 21 Jul 2017 13:27:49 +0000 (13:27 +0000)

Trivial merge