[dali_1.1.37] Merge branch 'devel/master' 18/73018/1
authorTom Robinson <tom.robinson@samsung.com>
Fri, 3 Jun 2016 13:34:07 +0000 (14:34 +0100)
committerTom Robinson <tom.robinson@samsung.com>
Fri, 3 Jun 2016 13:34:07 +0000 (14:34 +0100)
commit0f09829877c9b8523b00445e953b61e417ec3b5a
tree6c0f2429908944b31587c0d6a49c376e533bc5df
parent9c779d53223a5eae3be6f8af12954cea364a606b
parent0044bfc62785a364787799a8449afbcba3ff04eb
[dali_1.1.37] Merge branch 'devel/master'

Change-Id: I2d15962a357f586f63f5a8decc6e996bf8a7487a