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
665c06e4
Commit
665c06e4
authored
10 years ago
by
Nick Kralevich
Browse files
Options
Downloads
Plain Diff
resolved conflicts for merge of
7ef348b1
to lmp-mr1-dev-plus-aosp
Change-Id: I0f1dd74fc8aee74c930cbfdd8d497cad7710d780
parents
854ad128
7ef348b1
No related branches found
No related tags found
Loading
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
app.te
+1
-1
1 addition, 1 deletion
app.te
isolated_app.te
+0
-3
0 additions, 3 deletions
isolated_app.te
with
1 addition
and
4 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
