Merge branch 'tizen' into cynara 32/38932/1
authorZbigniew Jasinski <z.jasinski@samsung.com>
Thu, 30 Apr 2015 14:21:54 +0000 (16:21 +0200)
committerZbigniew Jasinski <z.jasinski@samsung.com>
Thu, 30 Apr 2015 14:22:05 +0000 (16:22 +0200)
commitc5d8a0b0335b31721053efe1162487feac1e8bc0
tree72d35a198eb7f5e69a00b71cc551496753ba35f6
parent523b9580a91dc39cf144c2e4eb4c0f43136af21e
parent396c1688ce21dd4195ada9f226fc79dbd057088f
Merge branch 'tizen' into cynara

Change-Id: Id45585ce7ff0566779229f240d957f4254071668