[dali_1.1.12] Merge branch 'devel/master' 91/52891/1
authorAdeel Kazmi <adeel.kazmi@samsung.com>
Fri, 27 Nov 2015 10:17:56 +0000 (10:17 +0000)
committerAdeel Kazmi <adeel.kazmi@samsung.com>
Fri, 27 Nov 2015 10:17:56 +0000 (10:17 +0000)
Change-Id: I0390b5264c5c6c45caba85dcdd77e2d955c772f6


Trivial merge