Merge remote-tracking branch 'origin/tizen' into new_text 12/37212/1
authorPaul Wisbey <p.wisbey@samsung.com>
Fri, 20 Mar 2015 17:22:49 +0000 (17:22 +0000)
committerPaul Wisbey <p.wisbey@samsung.com>
Fri, 20 Mar 2015 17:23:28 +0000 (17:23 +0000)
commitd6ad9aff913e3d14eb832c105d29cd179e40ae60
tree570b14cbb6b257e7d0fddbd428cfc90774df885f
parent7214b931865d8768fb01d5db2299b77666a85f15
parentb5e043d0009cbf34150cc3c99846d4f5a2e4a2d7
Merge remote-tracking branch 'origin/tizen' into new_text

Change-Id: Ie9718a263a8ab3b12209e1409754834ed986460f
packaging/com.samsung.dali-demo.spec