OSDN Git Service

Merge "Force creation of Socket upon Transform application" am: 119cf2bc61
authorBenedict Wong <benedictwong@google.com>
Wed, 4 Apr 2018 19:52:00 +0000 (12:52 -0700)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 4 Apr 2018 19:52:00 +0000 (12:52 -0700)
commit16cec63d28756c33d8dce6489c98a62aaecbf6d9
treeaecaf634f99d43724a46de4c2fb650404d595e54
parent221a454129bbca04c53b27a7a04fa95bfd60815f
parentabcf07af81f81eaa434aa377f174a1e6bdf62b5d
Merge "Force creation of Socket upon Transform application" am: 119cf2bc61
am: abcf07af81

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