[dali_1.1.11] Merge branch 'devel/master' 85/52285/1
authorRichard Huang <r.huang@samsung.com>
Fri, 20 Nov 2015 10:58:53 +0000 (10:58 +0000)
committerRichard Huang <r.huang@samsung.com>
Fri, 20 Nov 2015 10:58:53 +0000 (10:58 +0000)
commit44e6186793816009ff6d1cbb51114218f6bec7f9
tree33ebc158dc71581f892b40d9444fd4198f64eba9
parent136309f9638b56b316cee85c3fb7a67988b180c3
parent41d5d99af188dd11c8e32cefdf6c956e90ee031a
[dali_1.1.11] Merge branch 'devel/master'

Change-Id: I0b46b3d93eb35506f70be536ed5de59f887c3295