[dali_1.1.3] Merge branch 'devel/master' 55/48355/1
authorXiangyin Ma <x1.ma@samsung.com>
Fri, 18 Sep 2015 10:03:45 +0000 (11:03 +0100)
committerXiangyin Ma <x1.ma@samsung.com>
Fri, 18 Sep 2015 10:03:45 +0000 (11:03 +0100)
commit5a06fb112e597dc2780ade446ae035ae15a5b037
tree4356237959b91e02d8dc48893633f4e9f7996a15
parentbfba32ee6a85f1ca0feefe8778dd406afedaeac8
parent24d4c67d01845ffe256d122748796030dceeb9de
[dali_1.1.3] Merge branch 'devel/master'

Change-Id: I7bfe198ba4590cd26b0e7ce569525d67b6d8c537