[dali_1.2.8] Merge branch 'devel/master' 83/90583/1
authoradam.b <adam.b@samsung.com>
Fri, 30 Sep 2016 14:12:31 +0000 (15:12 +0100)
committeradam.b <adam.b@samsung.com>
Fri, 30 Sep 2016 14:12:31 +0000 (15:12 +0100)
commit6e4f4a25d58c5ffee4f170f2c0560b05f2264b45
tree287f856bb171fba25c5f74194345af3417107b72
parent4f6e2be595ae72c307285f8c74f9bcb15c95a11c
parent355ca1a4b4053a10d5f55534d38f859b804b8ad9
[dali_1.2.8] Merge branch 'devel/master'

Change-Id: I0999dbd47bde62fdb3bbb08a6aa062b1d224c523