[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)
commite1e7301b025bf15832d981144563e82632f86416
tree60cb5ec2f674172b84823658741696ac9ce725b8
parent1e5d77196a7da2fa41801bb39dc4b143d6839372
parent7f45a8040adabb52f95f2e0398939894c6fdf01b
[dali_1.2.46] Merge branch 'devel/master'

Change-Id: Ib5e354bd8d1b814e933b62440ddffef6c652cf12