[dali_1.2.30] Merge branch 'devel/master' 66/118466/1
authorDavid Steele <david.steele@samsung.com>
Fri, 10 Mar 2017 15:01:59 +0000 (15:01 +0000)
committerDavid Steele <david.steele@samsung.com>
Fri, 10 Mar 2017 15:01:59 +0000 (15:01 +0000)
commit980c500b4d7c4413735e60d5cdfc0bed695ff622
treebf823f542d8c8e08653a93bc4becb8cc74e3c3d3
parenta4dd5a82c1ff9a703ac8744d628def9ddefd9223
parent34615d79aa50f51bc33c60eff91a7cceed0cb75f
[dali_1.2.30] Merge branch 'devel/master'

Change-Id: I53d18f00c7a29e651ed9bdbb522a5fbf68e10986