[dali_1.1.5] Merge branch 'devel/master' 80/48980/1
authorChu Hoang <c.hoang@samsung.com>
Fri, 2 Oct 2015 09:39:25 +0000 (10:39 +0100)
committerChu Hoang <c.hoang@samsung.com>
Fri, 2 Oct 2015 09:39:25 +0000 (10:39 +0100)
commit1abe9ed8c6629f34dee99ce6e4923a000851d334
tree2c1026da5eae631af479b5128a8265ea9e37e75d
parent2cae846d16036e641287295af0c8557abd5b9617
parente90e76dc9844ea3608c4fd3ee9a2edf9f30fda51
[dali_1.1.5] Merge branch 'devel/master'

Change-Id: I8b97ae3e3b353a8aa123a4499baffbf6f83d41c9