tree d4b1396f202d8cda5ed5f7c48a9eb4d8cbc19bdc
parent 10cb43f1de8bb1dfb989c71c7340d74a6e2c7c16
parent b676aef03c2afb8b58dcea2ddc4f0c6af874e3ae
author Lorenzo Colitti <lorenzo@google.com> 1522391722 +0000
committer android-build-merger <android-build-merger@google.com> 1522391722 +0000

Merge "Clarify UDP encapsulation socket API"
am: b676aef03c

Change-Id: Ie1e7ea81440afee2618211d989989cf5daff3e1e