From: nharold <nharold@google.com>
Date: Sat, 3 Jun 2017 00:15:53 +0000 (+0000)
Subject: Merge "Add UDP Encap Socket Support to IpSecManager" am: 4f6ec3d11d am: c530c01744... 
X-Git-Tag: android-x86-9.0-r1~3193
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=a5cf046ca9aea26015e32107b6bfd90851cfb32a;p=android-x86%2Fframeworks-base.git

Merge "Add UDP Encap Socket Support to IpSecManager" am: 4f6ec3d11d am: c530c01744 am: 3c1484c715
am: 7577a2ff56

Change-Id: Iafed2773a6d32542b051d944341533b2190aa284
---

a5cf046ca9aea26015e32107b6bfd90851cfb32a