Merge "DALi Version 1.2.21" into devel/master
authorAdeel Kazmi <adeel.kazmi@samsung.com>
Fri, 6 Jan 2017 14:18:37 +0000 (06:18 -0800)
committerGerrit Code Review <gerrit@review.vlan103.tizen.org>
Fri, 6 Jan 2017 14:18:38 +0000 (06:18 -0800)

Trivial merge