[dali_1.1.33] Merge branch 'devel/master' 82/68582/1
authorDavid Steele <david.steele@samsung.com>
Fri, 6 May 2016 14:48:07 +0000 (15:48 +0100)
committerDavid Steele <david.steele@samsung.com>
Fri, 6 May 2016 14:48:07 +0000 (15:48 +0100)
commit03d39591118c47c450740aad8a7186f7e65f05da
tree761b1fd33995630d013fe93a31c13f11d29ae5dd
parentd2223117baea75e170556014107fbc6455c02cbc
parentf902e5b99065f46900df652402bba114a5892351
[dali_1.1.33] Merge branch 'devel/master'

Change-Id: I27d1470273853b185a74936736052d543ccfbb0e