[dali_1.3.11] Merge branch 'devel/master' 23/169823/1
authoradam.b <adam.b@samsung.com>
Fri, 9 Feb 2018 11:09:30 +0000 (11:09 +0000)
committeradam.b <adam.b@samsung.com>
Fri, 9 Feb 2018 11:09:30 +0000 (11:09 +0000)
commit9eade5d10eb913deb44346549c69cf2e7eb85222
tree137196cb4f8e3da2da74ee643918dded545c5e37
parent16af751ee1477db7981d4cb6491de5dd1110fda4
parent3cc068cb9fe1161c5c9ea5a6e82770bc57526ece
[dali_1.3.11] Merge branch 'devel/master'

Change-Id: I7d6f9b4e7ebcaef311c37f3ba5357cdaff79cea2