[dali_1.3.12] Merge branch 'devel/master' 79/170279/1
authorDavid Steele <david.steele@samsung.com>
Fri, 16 Feb 2018 13:56:47 +0000 (13:56 +0000)
committerDavid Steele <david.steele@samsung.com>
Fri, 16 Feb 2018 13:56:47 +0000 (13:56 +0000)
commit538adcb4669c590840aa223c4e98234fd7db7140
tree04a6d28c91ace01be463a0f9401219666e451484
parent77de769517b677fe26dc5a88cbdbf7fc76b8c599
parentb7a0babeb9127b970bbf040dc484140e63a6eecb
[dali_1.3.12] Merge branch 'devel/master'

Change-Id: I16db958ae9551c9e2bd671191152ba0749d411ac