[dali_1.2.46] Merge branch 'devel/master' 14/136614/1
authorAdeel Kazmi <adeel.kazmi@samsung.com>
Fri, 30 Jun 2017 10:21:35 +0000 (11:21 +0100)
committerAdeel Kazmi <adeel.kazmi@samsung.com>
Fri, 30 Jun 2017 10:21:36 +0000 (11:21 +0100)
Change-Id: Ib5e354bd8d1b814e933b62440ddffef6c652cf12


Trivial merge