resolve merge conflicts of 8988daa5 to master
Test: I solemnly swear I tested this conflict resolution. Change-Id: Id4353e38c8e79037801875280f4ad2ee2160405d
Showing
- private/file_contexts 1 addition, 1 deletionprivate/file_contexts
- private/hal_allocator.te 0 additions, 1 deletionprivate/hal_allocator.te
- private/hal_allocator_default.te 5 additions, 0 deletionsprivate/hal_allocator_default.te
- public/attributes 3 additions, 0 deletionspublic/attributes
- public/hal_allocator.te 0 additions, 5 deletionspublic/hal_allocator.te
- public/hal_camera.te 1 addition, 1 deletionpublic/hal_camera.te
- public/te_macros 1 addition, 1 deletionpublic/te_macros
Loading
Please register or sign in to comment