Nick Kralevich 28749e4d40 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 repo upload . Test: compiles/boots no problems. Change-Id: I4e7ee3fddfe021d128ebd70a663374367914b825		2017-10-09 09:11:41 -07:00
..
audit2allow	Merge remote-tracking branch 'aosp/upstream-master' into merge_expandattribute	2017-05-11 07:50:16 -07:00
chcat	Fix BINDIR/SBINDIR/... variables in Makefiles	2017-06-20 12:18:26 -04:00
semanage	python/semanage: Enable listing file_contexts.homedirs	2017-10-04 14:18:58 -04:00
sepolgen	Python 3.6 invalid escape sequence deprecation fixes	2017-03-10 15:56:36 -05:00
sepolicy	sepolicy: support non-MLS policy in gui	2017-09-25 12:59:29 -04:00
COPYING	Add COPYING files for new subdirs.	2016-11-16 11:19:51 -05:00
Makefile	Move policycoreutils/{sepolicy,audit2allow,semanage,scripts/chcat*} and sepolgen to python.	2016-11-16 11:19:50 -05:00
VERSION	Update VERSION files for 2.7 release.	2017-08-04 09:31:00 -04:00