[dali_1.1.45] Merge branch 'devel/master' 11/82111/1
authorAdeel Kazmi <adeel.kazmi@samsung.com>
Fri, 29 Jul 2016 16:12:34 +0000 (17:12 +0100)
committerAdeel Kazmi <adeel.kazmi@samsung.com>
Fri, 29 Jul 2016 16:12:34 +0000 (17:12 +0100)
Change-Id: I5e053987fe8ff570d0c3a4fe7e3f0e58b8fc661b


Trivial merge