[dali_1.1.37] Merge branch 'devel/master' 16/73016/1
authorTom Robinson <tom.robinson@samsung.com>
Fri, 3 Jun 2016 13:33:51 +0000 (14:33 +0100)
committerTom Robinson <tom.robinson@samsung.com>
Fri, 3 Jun 2016 13:33:51 +0000 (14:33 +0100)
commitbb3f70201ea74ca57fb3c2415693cdc6bd899fdc
treea6e0e50c0c72dde74aa2d4a2c4aa6edf4cbd0c3f
parentf20b09eeaf9f7c529761011904e7e7a4f4906574
parent91450243dcb1484c1f21cb44027daa306e3fff09
[dali_1.1.37] Merge branch 'devel/master'

Change-Id: I44271445ebbf4723d706414f29518d74c994fce5