[dali_1.1.29] Merge branch 'devel/master' 25/65325/1
authorXiangyin Ma <x1.ma@samsung.com>
Fri, 8 Apr 2016 10:25:06 +0000 (11:25 +0100)
committerXiangyin Ma <x1.ma@samsung.com>
Fri, 8 Apr 2016 10:25:06 +0000 (11:25 +0100)
commitddf80b57cb944aef9a11de669775e8fd0f9ff156
tree3d7fb9e0b25f83bead193e1f214dee51cddc9d53
parentc52bd11613bcee114875944045783d4c2fe2028e
parent8d4ac53aea879bd83625a4a42a0f8a621b547bd8
[dali_1.1.29] Merge branch 'devel/master'

Change-Id: I67df048f55cab38bfbf466ce4b128d9a2f22747c