OSDN Git Service

Merge "Add Tunnel Interface APIs to IpSecManager" am: 08d07aec50
authornharold <nharold@google.com>
Fri, 19 Jan 2018 20:16:38 +0000 (20:16 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 19 Jan 2018 20:16:38 +0000 (20:16 +0000)
commit0174b8afcfaf1cfd7231301564e57fa015f5836e
treecdc9d6da4b95eda9d38f7f9f2a90c943b78aac5f
parentcfbf873dd1099be5453ea9f0bbc0277e6a663257
parent696cff166cc0e00668b5c93446f99a477896e399
Merge "Add Tunnel Interface APIs to IpSecManager" am: 08d07aec50
am: 696cff166c

Change-Id: I0cd07c51e9512b7e9471e1a09c977fca2bf12e48