Merge branch 'tizen' into cynara 81/38581/1
authorZbigniew Jasinski <z.jasinski@samsung.com>
Wed, 22 Apr 2015 08:49:05 +0000 (10:49 +0200)
committerZbigniew Jasinski <z.jasinski@samsung.com>
Wed, 22 Apr 2015 08:52:31 +0000 (10:52 +0200)
commit523b9580a91dc39cf144c2e4eb4c0f43136af21e
tree9ff878ec71686ca6b4ed66878c29e30892cd194d
parentbbd5642547d6e210e40bfc4e543137c8948ca8e7
parent16c20883780444ad820e3f24032f0c7db9079bf9
Merge branch 'tizen' into cynara

Change-Id: I8a7de3e8b797c0caf5096de797e896667ea0d3dc