OSDN Git Service

Merge "Hide IpSecManager, IpSecTransform, and IpSecAlgorithm" am: 01e368f26d
authornharold <nharold@google.com>
Wed, 26 Apr 2017 17:31:23 +0000 (17:31 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 26 Apr 2017 17:31:23 +0000 (17:31 +0000)
commit52dab83f7ad282b43c1ea74c7ee4a0c6f4906615
treef096832f4f2451a14951e19f338f7d6c9a2e074b
parenta8e971b75c1adf7718184f0a65fbd9a6499f8f8e
parent939528045aa4b6e30a9ab8d908117910150458b4
Merge "Hide IpSecManager, IpSecTransform, and IpSecAlgorithm" am: 01e368f26d
am: 939528045a

Change-Id: Ic415f9f6d45f8c2477c3708c87af31ef725aa224