[dali_1.2.24] Merge branch 'devel/master' 06/112206/1
authorNick Holland <nick.holland@partner.samsung.com>
Fri, 27 Jan 2017 15:15:00 +0000 (15:15 +0000)
committerNick Holland <nick.holland@partner.samsung.com>
Fri, 27 Jan 2017 15:15:00 +0000 (15:15 +0000)
commit021cb4d6cf6f9ca6422fdb821970b25d9239a863
treeb3b62d2ec1e31481fbca449e5a839545d20ec29c
parent67f05fa704463e240cbbf6030cb27f6bdf6137b4
parent3a66fd3e1706e7e5d3643d35f268180e1386f4bc
[dali_1.2.24] Merge branch 'devel/master'

Change-Id: Ifd3c7d014a63d563361a9d7c54fc0c24c35c8a60