Nick Kralevich 18205ff9d7 Merge remote-tracking branch 'aosp/upstream-master' into mymerge ... Followed the following steps: # In repo client cd external/selinux repo sync . repo start mymerge . git merge aosp/upstream-master --no-ff # resolve any conflicts lunch && make -j repo upload . Test: compiles and boots Change-Id: I45fd32fb9bfe2291ef32afcc86f26eb2b24e03e8		2020-02-11 10:18:08 -08:00
..
cil	Merge remote-tracking branch 'aosp/upstream-master' into mymerge	2020-02-11 10:18:08 -08:00
include	Merge remote-tracking branch 'aosp/upstream-master' into mymerge	2020-02-11 10:18:08 -08:00
man	selinux: Update manpages after removing legacy boolean and user code	2019-07-29 23:46:47 +02:00
src	Merge remote-tracking branch 'aosp/upstream-master' into mymerge	2020-02-11 10:18:08 -08:00
tests	libsepol, libsemanage: add a macro to silence static analyzer warnings in tests	2019-09-30 08:43:41 -04:00
utils	libsepol: build: follow standard semantics for DESTDIR and PREFIX	2018-02-14 15:59:36 +01:00
.gitignore	libsepol: build cil into libsepol	2014-08-26 08:03:31 -04:00
Android.bp	libsepol: Fix compiler errors	2020-02-03 13:13:09 -08:00
COPYING	initial import from svn trunk revision 2950	2008-08-19 15:30:36 -04:00
Makefile	libsepol: build cil into libsepol	2014-08-26 08:03:31 -04:00
VERSION	Update VERSIONs to 3.0 for release.	2019-11-28 13:46:48 +01:00