Merge remote-tracking branch 'origin/tizen' into new_text 76/34376/1
authorPaul Wisbey <p.wisbey@samsung.com>
Mon, 26 Jan 2015 09:23:01 +0000 (09:23 +0000)
committerPaul Wisbey <p.wisbey@samsung.com>
Mon, 26 Jan 2015 09:24:50 +0000 (09:24 +0000)
Change-Id: I0398ed8d419761b2de813760593d7280dbdf7a89

1  2 
platform-abstractions/slp/file.list

Simple merge