[dali_1.3.51] Merge branch 'devel/master' 15/193715/1
authorAdeel Kazmi <adeel.kazmi@samsung.com>
Fri, 23 Nov 2018 11:37:47 +0000 (11:37 +0000)
committerAdeel Kazmi <adeel.kazmi@samsung.com>
Fri, 23 Nov 2018 11:37:47 +0000 (11:37 +0000)
Change-Id: I2255323ce904379235df0463ee862842cd6f295c


Trivial merge