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
eee78cbf
Commit
eee78cbf
authored
8 years ago
by
Mark Salyzyn
Committed by
android-build-merger
8 years ago
Browse files
Options
Downloads
Plain Diff
resolve merge conflicts of
91e7ac92
to stage-aosp-master am:
43c1d482
am:
135bf1eb
am:
14b2fedc
Change-Id: I6cb0d86781cc1b0f79a2563328e48411d64d252f
parents
c2ecefbc
14b2fedc
No related branches found
No related tags found
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
property_contexts
+1
-0
1 addition, 0 deletions
property_contexts
with
1 addition
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
