Merge branch 'cynara' into tizen 82/38582/1
authorZbigniew Jasinski <z.jasinski@samsung.com>
Wed, 22 Apr 2015 08:52:50 +0000 (10:52 +0200)
committerZbigniew Jasinski <z.jasinski@samsung.com>
Wed, 22 Apr 2015 08:55:57 +0000 (10:55 +0200)
commitc96e454948003646973b678be5e2ea9057fe0892
tree9ff878ec71686ca6b4ed66878c29e30892cd194d
parent16c20883780444ad820e3f24032f0c7db9079bf9
parent523b9580a91dc39cf144c2e4eb4c0f43136af21e
Merge branch 'cynara' into tizen

Change-Id: I2d1b3e38f0ccab3cec1a1a107fc778dfb604986f