Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

A

AndroidSystemSEPolicy
- Activity
- Members

Snippets Groups Projects

f265ffe3

Commit f265ffe3 authored 7 years ago by Joel Galenson Committed by android-build-merger 7 years ago

Downloads
- Plain Diff

resolve merge conflicts of 27c0aa7a to stage-aosp-master

am: 47966cec

Change-Id: If294b49998475d4cdfb4435d720a494f10325ab8

parents 1c5ee00f 47966cec

No related branches found

No related tags found

Loading

Changes 6

Hide whitespace changes

Inline Side-by-side

Showing

private/file_contexts 0 additions, 77 deletions

private/file_contexts
private/genfs_contexts 59 additions, 0 deletions

private/genfs_contexts
private/shell.te 3 additions, 3 deletions

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

private/system_server.te
public/file.te 1 addition, 3 deletions

public/file.te
public/init.te 1 addition, 1 deletion

public/init.te

with 65 additions and 84 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