[dali_1.3.10] Merge branch 'devel/master' 24/169124/1
authorAdeel Kazmi <adeel.kazmi@samsung.com>
Fri, 2 Feb 2018 10:29:22 +0000 (10:29 +0000)
committerAdeel Kazmi <adeel.kazmi@samsung.com>
Fri, 2 Feb 2018 10:29:22 +0000 (10:29 +0000)
Change-Id: I13d7a79df19bf81981b3d1bfef40c554d87ad21f


Trivial merge