[dali_1.1.38] Merge branch 'devel/master' 19/74019/1
authorXiangyin Ma <x1.ma@samsung.com>
Fri, 10 Jun 2016 10:48:57 +0000 (11:48 +0100)
committerXiangyin Ma <x1.ma@samsung.com>
Fri, 10 Jun 2016 10:48:57 +0000 (11:48 +0100)
commit3ef357cc431d17b7be772f0f74acb080feab123e
tree3050a4c3477f8e2041dc58a8014953529f84ac5b
parent0f09829877c9b8523b00445e953b61e417ec3b5a
parent6a456d79d70c259e394008c47ac77a4aa740c534
[dali_1.1.38] Merge branch 'devel/master'

Change-Id: I8ba464535bb20eabb7ea15b627436df249a43c4f