Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

A

AndroidSystemSEPolicy
- Activity
- Members

Snippets Groups Projects

a94bcafc

Commit a94bcafc authored 7 years ago by Tomasz Wasilczyk Committed by android-build-merger 7 years ago

Downloads
- Plain Diff

resolve merge conflicts of c998f319 to stage-aosp-master

am: 6ba6705c

Change-Id: I3c61feaac2a38a92fa42a29d79f7e8b4eab38642

parents f9d464b0 6ba6705c

Branches

Tags

No related merge requests found

Changes 7

Show whitespace changes

Inline Side-by-side

Showing

private/hwservice_contexts 1 addition, 1 deletion

private/hwservice_contexts
private/system_server.te 1 addition, 0 deletions

private/system_server.te
public/attributes 6 additions, 0 deletions

public/attributes
public/hal_broadcastradio.te 4 additions, 0 deletions

public/hal_broadcastradio.te
public/hwservice.te 1 addition, 0 deletions

public/hwservice.te
vendor/file_contexts 1 addition, 0 deletions

vendor/file_contexts
vendor/hal_broadcastradio_default.te 5 additions, 0 deletions

vendor/hal_broadcastradio_default.te

with 19 additions and 1 deletion

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