[dali_1.3.30] Merge branch 'devel/master' 05/183005/1
authoradam.b <adam.b@samsung.com>
Fri, 29 Jun 2018 12:51:49 +0000 (13:51 +0100)
committeradam.b <adam.b@samsung.com>
Fri, 29 Jun 2018 12:51:49 +0000 (13:51 +0100)
commit37875f405aef5450fc4119da6dc8a2354dc2c039
treec1ca8d6c4ccdc0970bbc5245b8aa9ed525449b56
parent88f4247651c1010fd455be1df0149a1d6958dcbf
parent86c9fdbbb437a9e63599c65fc3dedd66994d1abe
[dali_1.3.30] Merge branch 'devel/master'

Change-Id: Ib3243b3092bc6f379ae65187157f8eaf4f2e989d