[dali_1.2.22] Merge branch 'devel/master' 97/110297/1
authorDavid Steele <david.steele@samsung.com>
Fri, 13 Jan 2017 14:36:28 +0000 (14:36 +0000)
committerDavid Steele <david.steele@samsung.com>
Fri, 13 Jan 2017 14:36:28 +0000 (14:36 +0000)
commit0e462103c222ad05916840bc7d7c902cf5fc82a1
treea5dd62a59b2167b55e90fdb0bb3522567e2b3d68
parente54f982e0aaf23db4c3002a3d9fe47a19737bb71
parent211f627777335525710665041cc66d4e6bc38773
[dali_1.2.22] Merge branch 'devel/master'

Change-Id: Ia0fea2310111418861f2f63a9935cd5c8ca8cdff