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


Trivial merge