Merge "DALi Version 1.2.50" into devel/master
authorDavid Steele <david.steele@samsung.com>
Fri, 28 Jul 2017 16:02:03 +0000 (16:02 +0000)
committerGerrit Code Review <gerrit@review.ap-northeast-2.compute.internal>
Fri, 28 Jul 2017 16:02:03 +0000 (16:02 +0000)

Trivial merge