[dali_1.1.14] Merge branch 'devel/master' 38/54138/1
authorDavid Steele <david.steele@samsung.com>
Fri, 11 Dec 2015 14:42:31 +0000 (14:42 +0000)
committerDavid Steele <david.steele@samsung.com>
Fri, 11 Dec 2015 14:42:31 +0000 (14:42 +0000)
commit6a96ce4b626cfde1cf98814745acd9024f9c405a
treeec0c4fab546a03d950f8ed44d1614e6a3afe5034
parent4d8852eef15291ffcc2b9ff57853402707e9f418
parentf7bc55d5e515f21d154090faf7cb40573bb16ec6
[dali_1.1.14] Merge branch 'devel/master'

Change-Id: I9337e1e473272ba38bcf735ad57b3c4725f6c22b