[dali_1.1.13] Merge branch 'devel/master' 92/53392/1
authorXiangyin Ma <x1.ma@samsung.com>
Fri, 4 Dec 2015 11:03:48 +0000 (11:03 +0000)
committerXiangyin Ma <x1.ma@samsung.com>
Fri, 4 Dec 2015 11:03:48 +0000 (11:03 +0000)
commit4d8852eef15291ffcc2b9ff57853402707e9f418
tree34ee60da474fc2b773659b51a77a6fc859e20ae2
parent8aa5b5aaaa25d0fd3bad166824ec3c93596f827d
parent5cea4b3ad614f535a8fde5854e7f04275dc5e0e9
[dali_1.1.13] Merge branch 'devel/master'

Change-Id: Icc4b04e233366d1931753aa73ba804339c4a380a