tree a0b633f61341c75e3eac3730ffa7b049b8cb7def
parent c83f2378e3f556a4aa98ce433d5077dc3ee9574e
parent bdc59ca370bd2333601973450491a0d7f29dcb8d
author Lorenzo Colitti <lorenzo@google.com> 1522392497 +0000
committer android-build-merger <android-build-merger@google.com> 1522392497 +0000

Merge "Clarify UDP encapsulation socket API" am: db1e624ee1
am: bdc59ca370

Change-Id: I5fcf79691c670e710e46b3a9eac8a580c44028fb