[dali_1.2.39] Merge branch 'devel/master' 48/129048/1
authorDavid Steele <david.steele@samsung.com>
Fri, 12 May 2017 12:43:08 +0000 (13:43 +0100)
committerDavid Steele <david.steele@samsung.com>
Fri, 12 May 2017 12:43:08 +0000 (13:43 +0100)
commita7201bd99105be97a0b3d84f671bf6d289ca9e0e
tree0c9533db4546a1178aa7d47d93cd62ecaa96e052
parentffe860aa727b8e1bd33f7fe2c53f3daae993e076
parent3048cd795564aeb707d29ec5a4a51800fa6729e3
[dali_1.2.39] Merge branch 'devel/master'

Change-Id: Ie124e3ad1a0f9f6aa347235f7389867fa205cbde