resolve merge conflicts of d07ab2fe to stage-aosp-master
BUG: None Test: I solemnly swear I tested this conflict resolution. Change-Id: I58fff9dc7826eb60520b087d08ecd931cba63bf0
Showing
- prebuilts/api/28.0/private/compat/26.0/26.0.ignore.cil 1 addition, 0 deletionsprebuilts/api/28.0/private/compat/26.0/26.0.ignore.cil
- prebuilts/api/28.0/private/compat/27.0/27.0.ignore.cil 1 addition, 0 deletionsprebuilts/api/28.0/private/compat/27.0/27.0.ignore.cil
- prebuilts/api/28.0/private/crash_dump.te 13 additions, 0 deletionsprebuilts/api/28.0/private/crash_dump.te
- prebuilts/api/28.0/private/file_contexts 1 addition, 0 deletionsprebuilts/api/28.0/private/file_contexts
- prebuilts/api/28.0/private/surfaceflinger.te 1 addition, 0 deletionsprebuilts/api/28.0/private/surfaceflinger.te
- prebuilts/api/28.0/private/system_server.te 4 additions, 0 deletionsprebuilts/api/28.0/private/system_server.te
- prebuilts/api/28.0/public/app.te 0 additions, 3 deletionsprebuilts/api/28.0/public/app.te
- prebuilts/api/28.0/public/crash_dump.te 0 additions, 8 deletionsprebuilts/api/28.0/public/crash_dump.te
- prebuilts/api/28.0/public/domain.te 1 addition, 1 deletionprebuilts/api/28.0/public/domain.te
- prebuilts/api/28.0/public/kernel.te 1 addition, 1 deletionprebuilts/api/28.0/public/kernel.te
- prebuilts/api/28.0/public/property.te 1 addition, 0 deletionsprebuilts/api/28.0/public/property.te
- prebuilts/api/28.0/public/property_contexts 2 additions, 0 deletionsprebuilts/api/28.0/public/property_contexts
- prebuilts/api/28.0/public/vendor_init.te 1 addition, 0 deletionsprebuilts/api/28.0/public/vendor_init.te
Loading
Please register or sign in to comment