[dali_1.1.6] Merge branch 'devel/master' 34/49234/1
authorTom Robinson <tom.robinson@samsung.com>
Fri, 9 Oct 2015 09:49:08 +0000 (10:49 +0100)
committerTom Robinson <tom.robinson@samsung.com>
Fri, 9 Oct 2015 09:49:08 +0000 (10:49 +0100)
commitc60cf195a6700e2f56816ddf36e4b3b8bb3fbc39
tree668f9c80db93edc915c0b0cb87446436e4a09cb9
parent4f32d658dffcb42d6620e8375e9a85ad7deb7582
parent2841614fc8febcab92b5cfbbde7cb394141f6e5c
[dali_1.1.6] Merge branch 'devel/master'

Change-Id: I75ab625bcc0b5258cedcf7208358905f895ddfa7