[dali_1.1.10] Merge branch 'devel/master' 75/51775/1
authorAdeel Kazmi <adeel.kazmi@samsung.com>
Fri, 13 Nov 2015 16:34:18 +0000 (16:34 +0000)
committerAdeel Kazmi <adeel.kazmi@samsung.com>
Fri, 13 Nov 2015 16:34:18 +0000 (16:34 +0000)
Change-Id: Ic2a625b5362001e1766cd863f1d069b3eec810c5


Trivial merge