[dali_1.2.30] Merge branch 'devel/master' 68/118468/1
authorDavid Steele <david.steele@samsung.com>
Fri, 10 Mar 2017 15:02:27 +0000 (15:02 +0000)
committerDavid Steele <david.steele@samsung.com>
Fri, 10 Mar 2017 15:02:27 +0000 (15:02 +0000)
commit4e07c8c3498cef7c8dffbc08189be8e169d97f55
tree65b8d0eace8d87dc65b3613334eccc3909c8bc32
parent94d678d62ca15faaced5deaf379f9ea4a6f16b7d
parent9e442086831060db265bc96c863f56f4ae811282
[dali_1.2.30] Merge branch 'devel/master'

Change-Id: I4a0a4300a9c1598344bcb257cfc2fcba72ef3006