Merge "DALi Version 1.1.18" into devel/master
authorAdeel Kazmi <adeel.kazmi@samsung.com>
Fri, 22 Jan 2016 13:31:56 +0000 (05:31 -0800)
committerGerrit Code Review <gerrit@review.vlan103.tizen.org>
Fri, 22 Jan 2016 13:31:56 +0000 (05:31 -0800)

Trivial merge