| commit | b077f6abd3ca76941d98bad2986a6cf06ec03d26 | [log] [tgz] |
|---|---|---|
| author | Nathan Harold <nharold@google.com> | Thu Apr 06 01:34:32 2017 +0000 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Thu Apr 06 01:34:37 2017 +0000 |
| tree | 25cf22d4d9417d6833d65645f759568bcfc59475 | |
| parent | fade53591bfaf2b822be6e0ea9b57be67aa3b994 [diff] | |
| parent | a8a74e25ddb27a350c8f643590639b9131fae2e1 [diff] |
Merge changes from topic 'ipsec-svc-pick' into oc-dev * changes: Fix Log Traces for IpSecService SystemServer: fix StartIpSecService trace and log Add Initial IPsec APIs to IpSecService IpSecManager and IpSecTransform API Cleanup Change reserveSecurityParameterIndex() to take a remoteAddress Add a Skeleton IpSecService