b744f16fd2
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: android compiles and boots and no observed problems. Change-Id: Ibdc3617c75af6ba0d93756cec1ad5ae229e3d5e2 |
||
---|---|---|
.. | ||
include | ||
man | ||
src | ||
utils | ||
Android.bp | ||
exported.map | ||
exported_vendor.map | ||
LICENSE | ||
Makefile | ||
MODULE_LICENSE_PUBLIC_DOMAIN | ||
VERSION |