[dali_1.1.38] Merge branch 'devel/master' 20/74020/1
authorXiangyin Ma <x1.ma@samsung.com>
Fri, 10 Jun 2016 10:49:04 +0000 (11:49 +0100)
committerXiangyin Ma <x1.ma@samsung.com>
Fri, 10 Jun 2016 10:49:04 +0000 (11:49 +0100)
commit01842cc0ba65f1e917267d244747d68e5426b499
tree7c80ba75cb7cce50a6d481aafe33344e3db4e7a9
parent661bf429a56def085e118b5c7a48ae48ee41c86e
parent26c9e2476c1cdb6f14b8ca347885ff1bdb1f15fd
[dali_1.1.38] Merge branch 'devel/master'

Change-Id: Ie995ce8342cd34be613210b0934b43a51cf77600