4d25411b3a
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 |
||
---|---|---|
.. | ||
cil | ||
include | ||
man | ||
src | ||
tests | ||
utils | ||
.gitignore | ||
Android.bp | ||
COPYING | ||
Makefile | ||
VERSION |