Skip to content
Commit a56d973a authored by Automerger Merge Worker's avatar Automerger Merge Worker Committed by Android (Google) Code Review
Browse files

Merge changes from topic "am-5b3500c6a7f543f9abf695f3343f61c0" into sc-dev 

* changes:
  [automerger skipped] Expose uids related APIs in NetworkRequest and NetworkCapabilities am: 02ed58ad -s ours
  [automerger skipped] Replace the usage of UidRange am: f8c3e2eb -s ours
parents 76aabd7b dfc420dd
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