[dali_1.1.19] Merge branch 'devel/master' 46/58346/1
authorTom Robinson <tom.robinson@samsung.com>
Fri, 29 Jan 2016 11:34:02 +0000 (11:34 +0000)
committerTom Robinson <tom.robinson@samsung.com>
Fri, 29 Jan 2016 11:34:02 +0000 (11:34 +0000)
commitd894f394cfdeea4e482b0666fe25d6039dca6bcb
treede123692a6370c02ca771615e9a245694216697e
parentd4dc7a72226fcb61bae213fc79be3477d2fa53aa
parentdb1186aeea903832ea8ea49acc838fb59c42dce3
[dali_1.1.19] Merge branch 'devel/master'

Change-Id: I76c294380fcff7f3f4d4db081441e7df51d7dfce