[dali_1.3.30] Merge branch 'devel/master' 08/183008/1
authorAdeel Kazmi <adeel.kazmi@samsung.com>
Fri, 29 Jun 2018 13:24:59 +0000 (14:24 +0100)
committerAdeel Kazmi <adeel.kazmi@samsung.com>
Fri, 29 Jun 2018 13:24:59 +0000 (14:24 +0100)
Change-Id: I9f96666df1917806464e1d15cff3ce2d04eca8ec


Trivial merge