[dali_1.2.31] Merge branch 'devel/master' 29/119629/1
authorFrancisco Santos <f1.santos@samsung.com>
Fri, 17 Mar 2017 16:16:07 +0000 (16:16 +0000)
committerFrancisco Santos <f1.santos@samsung.com>
Fri, 17 Mar 2017 16:16:07 +0000 (16:16 +0000)
commit71c32effebda8dec9a88b2f62de0a4c253d6415f
treee4c252b426308b32122d7bf0ad5867680fc8b097
parent980c500b4d7c4413735e60d5cdfc0bed695ff622
parent25711120c43317d28ef2da9dd8bda53623505700
[dali_1.2.31] Merge branch 'devel/master'

Change-Id: I0f26281aaa46476b1833f0f459fca6ed604a63eb