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


Trivial merge