Skip to content
Snippets Groups Projects
Commit a0dfad55 authored by Nick Kralevich's avatar Nick Kralevich Committed by Android Git Automerger
Browse files

am bb21fe8a: resolved conflicts for merge of 8be3e779 to stage-aosp-master 

* commit 'bb21fe8a':
  move untrusted_app statement to the correct file.
parents 26f23377 bb21fe8a
No related branches found
No related tags found
No related merge requests found
Show whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment