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


Trivial merge