[dali_1.1.23] Merge branch 'devel/master' 97/60497/1
authorDavid Steele <david.steele@samsung.com>
Fri, 26 Feb 2016 13:45:52 +0000 (13:45 +0000)
committerDavid Steele <david.steele@samsung.com>
Fri, 26 Feb 2016 13:45:52 +0000 (13:45 +0000)
commitfb8ff3fce27c44788ed0977a2359736e6b4d8995
treee5a1662d0b9507ec6c14326ae219db43d00f6c90
parentd0aad612034b215780ee29e794b4791a122f91d7
parent33f033ebc1fd63418fe65a4d7e4844822f77179d
[dali_1.1.23] Merge branch 'devel/master'

Change-Id: Ica916337c61e4160274c24ce2009c7998bca09f6