[dali_1.1.23] Merge branch 'devel/master' 99/60499/1
authorDavid Steele <david.steele@samsung.com>
Fri, 26 Feb 2016 13:46:09 +0000 (13:46 +0000)
committerDavid Steele <david.steele@samsung.com>
Fri, 26 Feb 2016 13:46:09 +0000 (13:46 +0000)
commit236a510ec8824b0d52b36a91db9dc178130f5f32
treeeedfc7e1c9f4b7ab393b25459e2b202618fd4f83
parentb2075341afcb68b5f6eea7308f10d65b589c1be4
parent47e3e4a1a2e7014ac68e06372aebfec54b1991b5
[dali_1.1.23] Merge branch 'devel/master'

Change-Id: Ifef58b4bfd9e96941f2cc61f1491d127bd438835