Merge branch 'origin/tizen' into origin/ckm 44/40944/1
authorMaciej J. Karpiuk <m.karpiuk2@samsung.com>
Wed, 10 Jun 2015 09:21:27 +0000 (11:21 +0200)
committerMaciej J. Karpiuk <m.karpiuk2@samsung.com>
Wed, 10 Jun 2015 09:21:27 +0000 (11:21 +0200)
commit313aea801d0869f7de57f5ecf6d3534bd007a7a4
tree235362c691d8326c7bd190a71a1bb6cf780ee3a9
parent961f04cc33ec71a9f97d2b24d149cf2142a9a412
parente68270bf7d1c27f5d00d8f3d00da3dca1502edbf
Merge branch 'origin/tizen' into origin/ckm

Change-Id: If8bc45345b05df4e09e39ec233371320ebcf070a
src/ckm/async-api.cpp
src/ckm/capi-access_control.cpp
src/ckm/main.cpp
src/common/tests_common.h