Merge branch 'tizen' into security-manager 36/30736/1
authorMarcin Niesluchowski <m.niesluchow@samsung.com>
Mon, 24 Nov 2014 17:45:55 +0000 (18:45 +0100)
committerMarcin Niesluchowski <m.niesluchow@samsung.com>
Mon, 24 Nov 2014 17:47:10 +0000 (18:47 +0100)
commit1ccd95a99c22c43dea93b2d8e7dc2fbe60995a37
tree1be02acc66d8049cb7690ac2aea3d36a133e5d73
parent1313be1211dd386ac311a76ba0c6d61ccdc9f6ea
parent2c4e7e321b61c62969681ea0b17385823d4bd9ea
Merge branch 'tizen' into security-manager

Change-Id: Ia942a66c32828236c55e16871ce82ffa1aed95a5