[dali_1.1.12] Merge branch 'devel/master' 89/52889/1
authorAdeel Kazmi <adeel.kazmi@samsung.com>
Fri, 27 Nov 2015 10:17:42 +0000 (10:17 +0000)
committerAdeel Kazmi <adeel.kazmi@samsung.com>
Fri, 27 Nov 2015 10:17:42 +0000 (10:17 +0000)
commit636d837d78320c5c3aa33e30fbca2a81e87971e2
tree5d8cc2bc17e92366588417bcdcab642d8a2c551d
parentc2c66def2a4b6feffb0ff09f83bc402423741907
parenta44e86f291af09904ca1b1ed22bf1f83c23fa6d7
[dali_1.1.12] Merge branch 'devel/master'

Change-Id: If550d48a4aaee4f8cc85b3588dbddfcf3d293a24