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


Trivial merge