[dali_1.1.7] Merge branch 'devel/master' 37/50037/1
authorLee Morgan <Lee.morgan@partner.samsung.com>
Fri, 23 Oct 2015 10:00:51 +0000 (11:00 +0100)
committerLee Morgan <Lee.morgan@partner.samsung.com>
Fri, 23 Oct 2015 10:00:51 +0000 (11:00 +0100)
commit232bcb0bbb0f60ae98f1a96da9615dab35b06074
tree1f623720a9225da58dae1acfda12c81572a0591e
parent4351264e95b186ab1f9294bca188ea9a9863cb9e
parent3bfa67dbd9b690dada2516eec74342b815707465
[dali_1.1.7] Merge branch 'devel/master'

Change-Id: I2205465952bf5d181fe2452651e16707768db7fb