[dali_1.2.8] Merge branch 'devel/master' 84/90584/1
authoradam.b <adam.b@samsung.com>
Fri, 30 Sep 2016 14:12:46 +0000 (15:12 +0100)
committeradam.b <adam.b@samsung.com>
Fri, 30 Sep 2016 14:12:46 +0000 (15:12 +0100)
commit3e882d1a8dc3fbaa4f1f671e1d1da4d878ec04b6
tree2801c9c70499e36ee70f060c1a240347ca766e4b
parent762c7ea311e8ca9584679bf61f4475f07d9166ac
parent8b7d4ef509499fb4c30ba095d93ca7c28639ee70
[dali_1.2.8] Merge branch 'devel/master'

Change-Id: I826ef82f07f246258b07c9479f00aaf6200c8c7a