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)
commit3c1484c71551ffd0ced71053a2a3af16260e467e
tree44a4e777627d8da7aaed9237c3851d049cea4fed
parent99533575b25e89e3227b5b1a995e9592a8b9397a
parentc530c017441eaa56e0bed6b7fbca3fe05d8f6dab
Merge "Add UDP Encap Socket Support to IpSecManager" am: 4f6ec3d11d
am: c530c01744

Change-Id: I529711b4a658cdf82e223194ebae4ecf1a7f3ce2