Chiachang Wang 64dc55bfb8 Merge "Expose UdpEncapsulationSocket.getResourceId()" am: 8dc248c84a am: 569e241d5c am: 9ee71fd652 ...

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I67420def56b12c3008daaa001b8f09680439d940

2021-01-27 08:05:05 +00:00

..

android

Merge "Expose UdpEncapsulationSocket.getResourceId()" am: 8dc248c84a am: 569e241d5c am: 9ee71fd652

2021-01-27 08:05:05 +00:00

com/android/internal/net

Move NetworkStatsFactory into service directory

2019-04-03 14:28:41 -07:00