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


Trivial merge