OSDN Git Service

Merge "Clarify UDP encapsulation socket API" am: 2891409c93
authorLorenzo Colitti <lorenzo@google.com>
Fri, 30 Mar 2018 06:48:17 +0000 (06:48 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 30 Mar 2018 06:48:17 +0000 (06:48 +0000)
am: a12c8fe218

Change-Id: I5fcf79691c670e710e46b3a9eac8a580c44028fb

1  2 
api/current.txt
core/java/android/net/IpSecManager.java

diff --cc api/current.txt
Simple merge