Skip to content
Commit 14877540 authored by Chiachang Wang's avatar Chiachang Wang Committed by Automerger Merge Worker
Browse files

Merge "Expose UdpEncapsulationSocket.getResourceId()" am: 8dc248c8 am:... 

Merge "Expose UdpEncapsulationSocket.getResourceId()" am: 8dc248c8 am: 18896c83 am: 14dfb0cf am: 686fa2e9

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I4d7c23fe61edafbff41f848167eadd0fff39ce9a
parents 00da9bf3 686fa2e9
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