tree d4b1396f202d8cda5ed5f7c48a9eb4d8cbc19bdc
parent 7ea8c51311faa2a98701f1c8a48d7f070f74dc7b
parent db1e624ee1be3f1c45d7ea87b1cc11466e88935a
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: db1e624ee1

Change-Id: Ie1e7ea81440afee2618211d989989cf5daff3e1e