[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)
Change-Id: I8d3c27bc51d5c09d71e32fb8bf0787e354aff171


Trivial merge