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
141ac206
Commit
141ac206
authored
7 years ago
by
Nick Kralevich
Committed by
android-build-merger
7 years ago
Browse files
Options
Downloads
Plain Diff
resolve merge conflicts of
a92d3135
to stage-aosp-master am:
b748e652
am:
aa33afc9
am:
46f2dcb1
-s ours Change-Id: Ide86623fdfb3567df3ca5825a9e5cb5cb9e03b79
parents
bb145d21
46f2dcb1
No related branches found
Branches containing commit
No related tags found
Tags containing commit
Loading
Changes
0
Hide whitespace changes
Inline
Side-by-side
Showing
0 changed files
No files found.
with
0 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
