Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
S
sepolicy
Manage
Activity
Members
Plan
Wiki
Code
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Deploy
Releases
Package Registry
Model registry
Operate
Terraform modules
Analyze
Contributor analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
CodeLinaro
public-release-test
platform
system
sepolicy
Commits
dd3c9614
Commit
dd3c9614
authored
8 years ago
by
Daniel Micay
Committed by
android-build-merger
8 years ago
Browse files
Options
Downloads
Plain Diff
resolve merge conflicts of
5423db6e
to stage-aosp-master am:
5e6aa65f
am:
b10f3fbc
am:
cbd7b182
Change-Id: I5933e92a19410a5cb51af6e15b5a4d45487df699
parents
099fed44
cbd7b182
Loading
Loading
Loading
Changes
6
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
dumpstate.te
+1
-0
1 addition, 0 deletions
dumpstate.te
file.te
+3
-0
3 additions, 0 deletions
file.te
genfs_contexts
+5
-0
5 additions, 0 deletions
genfs_contexts
init.te
+3
-0
3 additions, 0 deletions
init.te
shell.te
+3
-0
3 additions, 0 deletions
shell.te
system_server.te
+3
-0
3 additions, 0 deletions
system_server.te
with
18 additions
and
0 deletions
Loading
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment
