OSDN Git Service

Merge "Hide IpSecManager, IpSecTransform, and IpSecAlgorithm" into oc-dev
authorNathan Harold <nharold@google.com>
Wed, 26 Apr 2017 18:10:04 +0000 (18:10 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 26 Apr 2017 18:10:04 +0000 (18:10 +0000)
commit8a82e7d548550c3ed8510cfd1378c5379c592712
tree00b13246335e997a3953956e345a2d962cdf7074
parent6c0dd10a7c2b97f05eb81f924c441a75253c7ab6
parent35eb324bf17e63a2e28c08484313d195e3f1e7f6
Merge "Hide IpSecManager, IpSecTransform, and IpSecAlgorithm" into oc-dev
am: 35eb324bf1

Change-Id: Iba429d1d96e28ccaf95d721b8b13cd107d4a0454