Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
A
AndroidSystemSEPolicy
Manage
Activity
Members
Code
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Deploy
Releases
Container registry
Model registry
Analyze
Contributor analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Werner Sembach
AndroidSystemSEPolicy
Commits
87ab488e
Commit
87ab488e
authored
8 years ago
by
Alex Klyubin
Committed by
android-build-merger
8 years ago
Browse files
Options
Downloads
Plain Diff
resolve merge conflicts of
952072b9
to stage-aosp-master am:
a98b9804
am:
5224fefe
Change-Id: I4fbd474be69e675f982b70673aa49480227734e1
parents
a53adef7
5224fefe
No related branches found
No related tags found
Loading
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
private/file_contexts
+1
-1
1 addition, 1 deletion
private/file_contexts
public/attributes
+1
-1
1 addition, 1 deletion
public/attributes
with
2 additions
and
2 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
