Lorenzo Colitti 3baa94c23f Merge "Clarify UDP encapsulation socket API" am: 0cf9421304 ...

am: a12c8fe218

Change-Id: I5fcf79691c670e710e46b3a9eac8a580c44028fb

2018-03-30 06:48:17 +00:00

..

android

Merge "Clarify UDP encapsulation socket API" am: 0cf9421304

2018-03-30 06:48:17 +00:00

com/android/internal/net

Merge "Fix network usage stats on 464xlat tethered." am: 83088dcd8e

2018-03-29 07:46:34 +00:00