resolve merge conflicts of 837a6f2 to master (32436ba2) · Commits · CodeLinaro / public-release-test / platform / system / sepolicy · GitLab

Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

S

sepolicy
- Activity
- Members
- Wiki
- Terraform modules

Snippets Groups Projects

32436ba2

Commit 32436ba2 authored 8 years ago by Chia-I Wu

Downloads
- Patches
- Plain Diff

resolve merge conflicts of 837a6f20 to master

Test: make
Change-Id: Icf77940472c7b7776b731c0ce0c1f53ac8bd198c

parent 057d754f

No related branches found

No related tags found

Loading

Changes 11

Hide whitespace changes

Inline Side-by-side

Showing

private/file_contexts 1 addition, 0 deletions

private/file_contexts
private/hal_graphics_allocator.te 1 addition, 0 deletions

private/hal_graphics_allocator.te
public/app.te 2 additions, 0 deletions

public/app.te
public/bootanim.te 1 addition, 0 deletions

public/bootanim.te
public/cameraserver.te 1 addition, 0 deletions

public/cameraserver.te
public/hal_graphics_allocator.te 10 additions, 0 deletions

public/hal_graphics_allocator.te
public/mediacodec.te 1 addition, 0 deletions

public/mediacodec.te
public/mediadrmserver.te 1 addition, 0 deletions

public/mediadrmserver.te
public/mediaserver.te 2 additions, 0 deletions

public/mediaserver.te
public/surfaceflinger.te 4 additions, 0 deletions

public/surfaceflinger.te
public/system_server.te 1 addition, 0 deletions

public/system_server.te

with 25 additions and 0 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment