projects
/
platform
/
core
/
test
/
security-tests.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
0de26ac
05c0634
)
Merge branch 'tizen' into security-manager
09/32109/1
author
Marcin Niesluchowski
<m.niesluchow@samsung.com>
Mon, 15 Dec 2014 15:38:01 +0000
(16:38 +0100)
committer
Marcin Niesluchowski
<m.niesluchow@samsung.com>
Mon, 15 Dec 2014 15:39:32 +0000
(16:39 +0100)
Change-Id: I0a590a3616c34fd61024dc353c799f6c83d1846b
1
2
tests/security-manager-tests/security_manager_tests.cpp
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
tests/security-manager-tests/security_manager_tests.cpp
Simple merge