OSDN Git Service

Merge "Add UDP Encap Socket Support to IpSecManager" am: 4f6ec3d11d
authornharold <nharold@google.com>
Fri, 2 Jun 2017 23:57:05 +0000 (23:57 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 2 Jun 2017 23:57:05 +0000 (23:57 +0000)
am: c530c01744

Change-Id: I529711b4a658cdf82e223194ebae4ecf1a7f3ce2


Trivial merge