[dali_1.2.46] Merge branch 'devel/master' 17/136617/1
authorAdeel Kazmi <adeel.kazmi@samsung.com>
Fri, 30 Jun 2017 10:21:57 +0000 (11:21 +0100)
committerAdeel Kazmi <adeel.kazmi@samsung.com>
Fri, 30 Jun 2017 10:21:57 +0000 (11:21 +0100)
commitc2820c206ade88f7d3266f5b246328c58355fea2
treee19d140192fe1b765a1ebe5447f49e0118d99680
parent4daf5275230c4122ebff9aa6567fd105eba80d95
parent36adcdf274c88717ca3f0d498b08b805a1750902
[dali_1.2.46] Merge branch 'devel/master'

Change-Id: I1f048dab10a8d45bb116e98a2c2ba3348504fe94