Merge "DALi Version 1.2.1" into devel/master
authorAdeel Kazmi <adeel.kazmi@samsung.com>
Fri, 12 Aug 2016 11:06:21 +0000 (04:06 -0700)
committerGerrit Code Review <gerrit@review.vlan103.tizen.org>
Fri, 12 Aug 2016 11:06:21 +0000 (04:06 -0700)

Trivial merge