resolve merge conflicts of 91d398d8 to stage-aosp-master
Also add missing commit: ca595e11 Test: I solemnly swear I tested this conflict resolution. Change-Id: I2a210c3b58565a40117bf3d061e9bf904ed687c2
Showing
- Android.mk 171 additions, 4 deletionsAndroid.mk
- prebuilts/api/26.0/nonplat_sepolicy.cil 6109 additions, 0 deletionsprebuilts/api/26.0/nonplat_sepolicy.cil
- prebuilts/api/26.0/private/access_vectors 710 additions, 0 deletionsprebuilts/api/26.0/private/access_vectors
- prebuilts/api/26.0/private/adbd.te 141 additions, 0 deletionsprebuilts/api/26.0/private/adbd.te
- prebuilts/api/26.0/private/app.te 524 additions, 0 deletionsprebuilts/api/26.0/private/app.te
- prebuilts/api/26.0/private/app_neverallows.te 215 additions, 0 deletionsprebuilts/api/26.0/private/app_neverallows.te
- prebuilts/api/26.0/private/asan_extract.te 8 additions, 0 deletionsprebuilts/api/26.0/private/asan_extract.te
- prebuilts/api/26.0/private/atrace.te 24 additions, 0 deletionsprebuilts/api/26.0/private/atrace.te
- prebuilts/api/26.0/private/attributes 9 additions, 0 deletionsprebuilts/api/26.0/private/attributes
- prebuilts/api/26.0/private/audioserver.te 66 additions, 0 deletionsprebuilts/api/26.0/private/audioserver.te
- prebuilts/api/26.0/private/binder_in_vendor_violators.te 1 addition, 0 deletionsprebuilts/api/26.0/private/binder_in_vendor_violators.te
- prebuilts/api/26.0/private/binderservicedomain.te 22 additions, 0 deletionsprebuilts/api/26.0/private/binderservicedomain.te
- prebuilts/api/26.0/private/blkid.te 22 additions, 0 deletionsprebuilts/api/26.0/private/blkid.te
- prebuilts/api/26.0/private/blkid_untrusted.te 37 additions, 0 deletionsprebuilts/api/26.0/private/blkid_untrusted.te
- prebuilts/api/26.0/private/bluetooth.te 77 additions, 0 deletionsprebuilts/api/26.0/private/bluetooth.te
- prebuilts/api/26.0/private/bluetoothdomain.te 2 additions, 0 deletionsprebuilts/api/26.0/private/bluetoothdomain.te
- prebuilts/api/26.0/private/bootanim.te 3 additions, 0 deletionsprebuilts/api/26.0/private/bootanim.te
- prebuilts/api/26.0/private/bootstat.te 3 additions, 0 deletionsprebuilts/api/26.0/private/bootstat.te
- prebuilts/api/26.0/private/bufferhubd.te 3 additions, 0 deletionsprebuilts/api/26.0/private/bufferhubd.te
- prebuilts/api/26.0/private/cameraserver.te 3 additions, 0 deletionsprebuilts/api/26.0/private/cameraserver.te
Loading
Please register or sign in to comment