[dali_1.1.30] Merge branch 'devel/master' 74/66174/1
authorAdam Bialogonski <adam.b@samsung.com>
Fri, 15 Apr 2016 13:59:57 +0000 (14:59 +0100)
committerAdam Bialogonski <adam.b@samsung.com>
Fri, 15 Apr 2016 13:59:57 +0000 (14:59 +0100)
commitc0580aca6b1a109865a84f7dc17f033ff2ca50c6
tree53ed329b1083f7d08c0ac965cf6ae41d5a52bf34
parentdcbe581a107fdda950cca57f70dd759f01b74762
parentb0f19e543cdb60eea11db8534d244c6ec5ab4643
[dali_1.1.30] Merge branch 'devel/master'

Change-Id: I920f0f9567921035067dbb04c33b0ed7a37c5f61