diff options
author | Stephen Smalley <sds@tycho.nsa.gov> | 2013-12-09 16:10:24 -0500 |
---|---|---|
committer | Stephen Smalley <sds@tycho.nsa.gov> | 2013-12-09 16:10:24 -0500 |
commit | 5ba8c79721c8482927c985f9beeca0e52a62d366 (patch) | |
tree | c0bcc8dfbb054153f8a8e1850a9909bea1371cf7 /libselinux/utils/getdefaultcon.c | |
parent | f89377f24343eb4f10d5c197559447465598f8b1 (diff) | |
parent | 582c2d019926e5a34a637be6ff6eedd93e05f4ca (diff) | |
download | android_external_selinux-5ba8c79721c8482927c985f9beeca0e52a62d366.tar.gz android_external_selinux-5ba8c79721c8482927c985f9beeca0e52a62d366.tar.bz2 android_external_selinux-5ba8c79721c8482927c985f9beeca0e52a62d366.zip |
Merge branch 'master' into next
Conflicts:
policycoreutils/ChangeLog
Diffstat (limited to 'libselinux/utils/getdefaultcon.c')
0 files changed, 0 insertions, 0 deletions