OSDN Git Service

Merge "Update IpSecManager to use InetAddress and prefixLen" into pi-dev
authorBenedict Wong <benedictwong@google.com>
Fri, 6 Apr 2018 00:34:11 +0000 (17:34 -0700)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 6 Apr 2018 00:34:11 +0000 (17:34 -0700)
commitc96c65c6ca2dec6890e4cd4e7645662b364e65a8
tree1a5bae62b753ebfe8c1b129737cb5434ee43bde0
parentfc60efb4429e2443f8744679f0c01047080d7e36
parentb172d5b4375ecb1895d3d7bed3d94e4fac3551a2
Merge "Update IpSecManager to use InetAddress and prefixLen" into pi-dev
am: b172d5b437

Change-Id: I03c0745662ab8868f719dc65c9ff8502e2ff817c
core/java/android/net/IpSecManager.java
tests/net/java/android/net/IpSecManagerTest.java