Jeff Vander Stoep d48d465bdd Merge remote-tracking branch 'aosp/upstream-master' into merge_expandattribute ... Bug: 36508258 Bug: 37319524 Test: build and boot Marlin Change-Id: Ib31a900ac70919835bcfc6bf9f6938a7aec622c2		2017-05-11 07:50:16 -07:00
..
include/cil	Merge remote-tracking branch 'aosp/upstream-master' into mymerge	2017-04-12 14:45:12 -07:00
src	Merge remote-tracking branch 'aosp/upstream-master' into merge_expandattribute	2017-05-11 07:50:16 -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