Nick Kralevich 4d25411b3a 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: I4cd9f73fbbb818ef7fa07ff8dd183f8a7e892345		2018-08-06 13:55:59 -07:00
..
include/cil	libsepol: cil: Keep type[attribute] declarations when attributizing.	2017-10-11 12:59:43 -07:00
src	Merge remote-tracking branch 'aosp/upstream-master' into mymerge	2018-08-06 13:55:59 -07:00
test	libsepol: Move secilc out of libsepol	2015-03-31 12:31:38 -04:00
.gitignore	Merge commit '76ba6eaa7333483a8cc0c73a7880f7acf99c2656'	2015-02-18 09:25:20 -05:00