OSDN Git Service

Merge changes from topic 'ipsec-api-tweaks-merge' into oc-dev
authorNathan Harold <nharold@google.com>
Fri, 14 Apr 2017 20:21:13 +0000 (20:21 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Fri, 14 Apr 2017 20:21:17 +0000 (20:21 +0000)
commit9361283073213890059c60787ebac920455fbd31
treed33051fa02d3ce8842e35cd09a9c8df8964e4935
parentd210ce63d00aa76ec680781bcee08543cc839e66
parent09098dc441913f30905f6ffd6f73262924858dd0
Merge changes from topic 'ipsec-api-tweaks-merge' into oc-dev

* changes:
  Add FileDescriptor Versions of applyTransportModeTransform()
  IpSecManager and IpSecAlgorithm API Tweaks
api/current.txt
api/system-current.txt
api/test-current.txt