Merge "DALi Version 1.1.36" into devel/master
authorAdeel Kazmi <adeel.kazmi@samsung.com>
Fri, 27 May 2016 12:35:27 +0000 (05:35 -0700)
committerGerrit Code Review <gerrit@review.vlan103.tizen.org>
Fri, 27 May 2016 12:35:27 +0000 (05:35 -0700)

Trivial merge