[dali_1.2.37] Merge branch 'devel/master' 18/127718/1
authorAdeel Kazmi <adeel.kazmi@samsung.com>
Fri, 28 Apr 2017 10:33:33 +0000 (11:33 +0100)
committerAdeel Kazmi <adeel.kazmi@samsung.com>
Fri, 28 Apr 2017 10:33:34 +0000 (11:33 +0100)
commit62403989c09a5cca87e061b59618c5bfc3dc899f
tree0ed69ce97b5b4bea2eeb6a51eac98f94afce8de1
parent6e05d2da56fde9a67ff3ead673493879deaab301
parent529b850c3abad5f92f6f1dd0a63967b92a065348
[dali_1.2.37] Merge branch 'devel/master'

Change-Id: I15895d1fdf177877c9cff6031843d35f5ab90e49