[dali_1.1.22] Merge branch 'devel/master' 20/59920/1
authorAgnelo Vaz <agnelo.vaz@samsung.com>
Fri, 19 Feb 2016 10:52:42 +0000 (10:52 +0000)
committerAgnelo Vaz <agnelo.vaz@samsung.com>
Fri, 19 Feb 2016 10:52:42 +0000 (10:52 +0000)
Change-Id: Iae75dbeb72218a3a72514fa71261ccb680273bd8


Trivial merge