Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Skip to content
Commit b81d3324 authored by Robert Horvath's avatar Robert Horvath Committed by Automerger Merge Worker
Browse files

[automerger skipped] Merge "Annotate setUidFirewallRule with @GuardedBy" am:... 

[automerger skipped] Merge "Annotate setUidFirewallRule with @GuardedBy" am: 7695e38e am: 012b5cf1 am: 6d28cc44 -s ours am: b75312a4 -s ours am: 06052952 -s ours

am skip reason: Merged-In I1f6c3c9e339935c06b3edd5436b2b1a7922a67ed with SHA-1 22fc59ad is already in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1991973

Change-Id: I60110d7ce5d33eaec1afd197d1e8001e3b2d955e
parents dc7336bd 06052952
Hide whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment