[dali_1.2.14] Merge branch 'devel/master' 64/97264/1
authorAdeel Kazmi <adeel.kazmi@samsung.com>
Fri, 11 Nov 2016 18:41:05 +0000 (18:41 +0000)
committerAdeel Kazmi <adeel.kazmi@samsung.com>
Fri, 11 Nov 2016 18:41:05 +0000 (18:41 +0000)
Change-Id: I3bbf18b3f11e44ed5ab56742ac954d3e222e68a9


Trivial merge