commit | 9361283073213890059c60787ebac920455fbd31 | [log] [tgz] |
---|---|---|
author | Nathan Harold <nharold@google.com> | Fri Apr 14 20:21:13 2017 +0000 |
committer | Android (Google) Code Review <android-gerrit@google.com> | Fri Apr 14 20:21:17 2017 +0000 |
tree | d33051fa02d3ce8842e35cd09a9c8df8964e4935 | |
parent | d210ce63d00aa76ec680781bcee08543cc839e66 [diff] | |
parent | 09098dc441913f30905f6ffd6f73262924858dd0 [diff] |
Merge changes from topic 'ipsec-api-tweaks-merge' into oc-dev * changes: Add FileDescriptor Versions of applyTransportModeTransform() IpSecManager and IpSecAlgorithm API Tweaks