[dali_1.2.43] Merge branch 'devel/master' 88/133288/3
authorAdeel Kazmi <adeel.kazmi@samsung.com>
Fri, 9 Jun 2017 12:48:21 +0000 (13:48 +0100)
committerAdeel Kazmi <adeel.kazmi@samsung.com>
Fri, 9 Jun 2017 12:48:21 +0000 (13:48 +0100)
commit0af70d8ff949d3cd90510b360b7236c73fb038ef
tree6748ae1690ba3c0c999841bf7492eae4058df472
parent7ab969fbd5e091f206a3407f7da115aaf103d3cc
parent8a303cc145768fb41bac843d18b1316d13ca6d95
[dali_1.2.43] Merge branch 'devel/master'

Change-Id: Ic218cd0377609c4e24ebd19ea4792ae7b57f1af9