Merge "DALi Version 1.2.48" into devel/master
authorDavid Steele <david.steele@samsung.com>
Fri, 14 Jul 2017 13:01:35 +0000 (13:01 +0000)
committerGerrit Code Review <gerrit@review.ap-northeast-2.compute.internal>
Fri, 14 Jul 2017 13:01:35 +0000 (13:01 +0000)

Trivial merge