[dali_1.2.14] Merge branch 'devel/master' 62/97262/1
authorAdeel Kazmi <adeel.kazmi@samsung.com>
Fri, 11 Nov 2016 18:40:47 +0000 (18:40 +0000)
committerAdeel Kazmi <adeel.kazmi@samsung.com>
Fri, 11 Nov 2016 18:40:47 +0000 (18:40 +0000)
Change-Id: I8d624755a54eb42a25aa887bd1faa6e5564f74d9


Trivial merge