[dali_1.2.49] Merge branch 'devel/master' 55/140055/1
authorDavid Steele <david.steele@samsung.com>
Fri, 21 Jul 2017 13:25:18 +0000 (14:25 +0100)
committerDavid Steele <david.steele@samsung.com>
Fri, 21 Jul 2017 13:25:18 +0000 (14:25 +0100)
commitbfd6c56d4d17e2bf752845693e2df370444a6ebf
tree09dd62cffb37403fdc8a96e888832c5e43ef0991
parent3994a8fa38310fc7dd7bbfbf37c982cea8d199da
parent229d9158a4f8e542ee7b64ff7d2d8551923b473e
[dali_1.2.49] Merge branch 'devel/master'

Change-Id: I7f3cf6dc4fbbac8de9b8af584f545bc17368e81d