[dali_1.2.30] Merge branch 'devel/master' 65/118465/1
authorDavid Steele <david.steele@samsung.com>
Fri, 10 Mar 2017 15:01:46 +0000 (15:01 +0000)
committerDavid Steele <david.steele@samsung.com>
Fri, 10 Mar 2017 15:01:46 +0000 (15:01 +0000)
commit6e5768771c9f9e0667ad8f61430135b7b61bbcab
treeb1aab58c20e4af1770359be56740772ddc0d0101
parent4dc37629dd59d48e00bf17496ba0b76fe137af0c
parent753f77be3e6769cd9f848248972bd63ef1925f1e
[dali_1.2.30] Merge branch 'devel/master'

Change-Id: I8d3c27bc51d5c09d71e32fb8bf0787e354aff171