Skip to content
Commit 5e7017b5 authored by Android Build Merger (Role)'s avatar Android Build Merger (Role) Committed by Android (Google) Code Review
Browse files

Merge "Merge "Merge "[CHERRY-PICK] API for apps to tag sockets with their own... 

Merge "Merge "Merge "[CHERRY-PICK] API for apps to tag sockets with their own UID." am: bef8c596 am: 826657a9" into oc-mr1-dev-plus-aosp am: 11448df5  -s ours"
parents 91a92b9a 06cac97a
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