Nick Kralevich 72ba6b4369 Merge remote-tracking branch 'aosp/upstream-master' into manualmerge ... In particular, this merges in https://github.com/SELinuxProject/selinux/pull/99 , which makes Android builds quieter. 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. Bug: 115998215 Change-Id: I0be55971cfc0c18722ff0ac755864b1b4b6657e0		2018-09-21 12:58:18 -07:00
..
audit2allow	Merge remote-tracking branch 'aosp/upstream-master' into mymerge	2018-08-06 13:55:59 -07:00
chcat	python: build: follow standard semantics for DESTDIR and PREFIX	2018-02-14 20:02:01 +01:00
semanage	semanage: add a missing space in ibendport help	2018-09-09 21:35:51 +02:00
sepolgen	python: remove semicolon from end of lines	2018-08-19 17:55:19 +02:00
sepolicy	python: remove semicolon from end of lines	2018-08-19 17:55:19 +02: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 VERSIONs to 2.8 for release.	2018-05-24 14:21:09 -04:00