[dali_1.1.20] Merge branch 'devel/master' 50/58950/1
authorXiangyin Ma <x1.ma@samsung.com>
Fri, 5 Feb 2016 08:53:35 +0000 (08:53 +0000)
committerXiangyin Ma <x1.ma@samsung.com>
Fri, 5 Feb 2016 08:53:35 +0000 (08:53 +0000)
commitd14fbe3a8fad2141cf06c4589c58cc615ba3be80
treea9e9cbf972d3bf5941e2bf6180098264946f398f
parent3853b8f5e33a81dae7f929b82b3e891b1c3cb08b
parentfd07122d268dd5293b7466c670a517b21bed1202
[dali_1.1.20] Merge branch 'devel/master'

Change-Id: If74f4a0e8274b36e3622c22b10ef3ed9aad6a609