Merge "DALi Version 1.2.0" into devel/master
authorAdeel Kazmi <adeel.kazmi@samsung.com>
Fri, 5 Aug 2016 14:02:12 +0000 (07:02 -0700)
committerGerrit Code Review <gerrit@review.vlan103.tizen.org>
Fri, 5 Aug 2016 14:02:12 +0000 (07:02 -0700)

Trivial merge